From 0f5f1acfd63ceda4eb995992aeff783f99d86d7c Mon Sep 17 00:00:00 2001 From: rembo10 Date: Sun, 9 Dec 2012 05:31:31 -0500 Subject: [PATCH] Fixed an issue with headphones not starting when upgrading the encoderfolder to encoder_path --- headphones/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/headphones/__init__.py b/headphones/__init__.py index 2d99b679..9286835f 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -500,12 +500,7 @@ def initialize(): # Update the config to use direct path to the encoder rather than the encoder folder if ENCODERFOLDER: - if ENCODER == "xld": - ENCODER_PATH = os.path.join(headphones.ENCODERFOLDER.encode(headphones.SYS_ENCODING), 'xld') - elif ENCODER == "ffmpeg": - ENCODER_PATH = os.path.join(headphones.ENCODERFOLDER.encode(headphones.SYS_ENCODING), 'ffmpeg') - elif ENCODER == "lame": - ENCODER_PATH = os.path.join(headphones.ENCODERFOLDER.encode(headphones.SYS_ENCODING), 'lame') + ENCODER_PATH = os.path.join(ENCODERFOLDER, ENCODER) CONFIG_VERSION = '3' if not LOG_DIR: