diff --git a/core/src/util/mod.rs b/core/src/util/mod.rs index d6cbdd68..6e21a0f2 100644 --- a/core/src/util/mod.rs +++ b/core/src/util/mod.rs @@ -4,7 +4,6 @@ use num_integer::Integer; use rand::{Rng, Rand}; use std::mem; use std::ops::{Mul, Rem, Shr}; -use std::process::Command; mod int128; mod spotify_id; @@ -16,16 +15,6 @@ pub fn rand_vec(rng: &mut G, size: usize) -> Vec { rng.gen_iter().take(size).collect() } -pub fn run_program(program: &str) { - info!("Running {}", program); - let mut v: Vec<&str> = program.split_whitespace().collect(); - let status = Command::new(&v.remove(0)) - .args(&v) - .status() - .expect("program failed to start"); - info!("Exit status: {}", status); -} - pub fn powm(base: &BigUint, exp: &BigUint, modulus: &BigUint) -> BigUint { let mut base = base.clone(); let mut exp = exp.clone(); diff --git a/playback/src/player.rs b/playback/src/player.rs index 3958ab8a..f0ee5d22 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -4,13 +4,14 @@ use std; use std::borrow::Cow; use std::io::{Read, Seek, SeekFrom, Result}; use std::mem; +use std::process::Command; use std::sync::mpsc::{RecvError, TryRecvError, RecvTimeoutError}; use std::thread; use std::time::Duration; use core::config::{Bitrate, PlayerConfig}; use core::session::Session; -use core::util::{self, SpotifyId}; +use core::util::SpotifyId; use audio_backend::Sink; use audio::{AudioFile, AudioDecrypt}; @@ -376,13 +377,13 @@ impl PlayerInternal { fn run_onstart(&self) { if let Some(ref program) = self.config.onstart { - util::run_program(program) + run_program(program) } } fn run_onstop(&self) { if let Some(ref program) = self.config.onstop { - util::run_program(program) + run_program(program) } } @@ -516,3 +517,13 @@ impl Seek for Subfile { } } } + +fn run_program(program: &str) { + info!("Running {}", program); + let mut v: Vec<&str> = program.split_whitespace().collect(); + let status = Command::new(&v.remove(0)) + .args(&v) + .status() + .expect("program failed to start"); + info!("Exit status: {}", status); +}