diff options
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/play_queue.rs | 6 | ||||
| -rw-r--r-- | src/audio/ytdl.rs | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/audio/play_queue.rs b/src/audio/play_queue.rs index e2d4468..ff1c2c9 100644 --- a/src/audio/play_queue.rs +++ b/src/audio/play_queue.rs @@ -31,7 +31,7 @@ use crate::{ sound_levels::DEFAULT_VOLUME, }, Result, - CONFIG, + CONFIG, FFMPEG_COMMAND, }; const SECONDS_LEAD_TIME: f32 = 0.75; @@ -146,7 +146,7 @@ impl PlayQueue { vec! [] }; - let ffmpeg_command = process::Command::new("ffmpeg") + let ffmpeg_command = process::Command::new(&*FFMPEG_COMMAND) .arg("-i") .arg(youtube_url) .args(duration_opts) @@ -172,7 +172,7 @@ impl PlayQueue { voice::pcm(true, reader) }, Right(ref vec) => { - let transcoder = process::Command::new("ffmpeg") + let transcoder = process::Command::new(&*FFMPEG_COMMAND) .args(&[ "-format", "opus", "-i", "pipe:0", diff --git a/src/audio/ytdl.rs b/src/audio/ytdl.rs index 46f0e27..002244c 100644 --- a/src/audio/ytdl.rs +++ b/src/audio/ytdl.rs @@ -13,8 +13,13 @@ use serenity::{ VoiceError, } }; +use lazy_static::lazy_static; -use crate::Result; +use crate::{Result, CONFIG}; + +lazy_static! { + static ref YTDL_COMMAND: String = CONFIG.ytdl.clone().unwrap_or("youtube-dl".to_owned()); +} pub fn ytdl_url(uri: &str) -> Result<String> { let args = [ @@ -26,7 +31,7 @@ pub fn ytdl_url(uri: &str) -> Result<String> { uri, ]; - let out = Command::new("youtube-dl") + let out = Command::new(&*YTDL_COMMAND) .args(&args) .stdin(Stdio::null()) .output()?; |