gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-16 00:25:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'encoderfolder-hotfix' into develop

Browse Source
This commit is contained in:
rembo10
2012-12-09 05:32:29 -05:00
parent 2ed6652d7a 0f5f1acfd6
commit efee0d0b80
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
headphones/__init__.py
View File

@@ -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: