diff --git a/headphones/__init__.py b/headphones/__init__.py index 9949986d..a184b668 100755 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -117,6 +117,7 @@ ENCODERFOLDER = None ENCODER = None BITRATE = None SAMPLINGFREQUENCY = None +ADVANCEDENCODER = None def CheckSection(sec): """ Check if INI section exists, if not create it """ @@ -176,7 +177,7 @@ def initialize(): LIBRARYSCAN_INTERVAL, DOWNLOAD_SCAN_INTERVAL, SAB_HOST, SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, \ NZBMATRIX, NZBMATRIX_USERNAME, NZBMATRIX_APIKEY, NEWZNAB, NEWZNAB_HOST, NEWZNAB_APIKEY, \ NZBSORG, NZBSORG_UID, NZBSORG_HASH, NEWZBIN, NEWZBIN_UID, NEWZBIN_PASSWORD, LASTFM_USERNAME, INTERFACE, FOLDER_PERMISSIONS, \ - ENCODERFOLDER, ENCODER, BITRATE, SAMPLINGFREQUENCY, ENCODE + ENCODERFOLDER, ENCODER, BITRATE, SAMPLINGFREQUENCY, ENCODE, ADVANCEDENCODER if __INITIALIZED__: return False @@ -262,6 +263,7 @@ def initialize(): BITRATE = check_setting_int(CFG, 'General', 'bitrate', 192) SAMPLINGFREQUENCY= check_setting_int(CFG, 'General', 'samplingfrequency', 44100) ENCODE = bool(check_setting_int(CFG, 'General', 'encode', 0)) + ADVANCEDENCODER = = check_setting_int(CFG, 'General', 'advancedencoder', '') if not LOG_DIR: LOG_DIR = os.path.join(DATA_DIR, 'logs') @@ -441,6 +443,7 @@ def config_write(): new_config['General']['bitrate'] = BITRATE new_config['General']['samplingfrequency'] = SAMPLINGFREQUENCY new_config['General']['encoderfolder'] = ENCODERFOLDER + new_config['General']['advancedencoder'] = ADVANCEDENCODER new_config.write() diff --git a/headphones/encode.py b/headphones/encode.py index 10fd63b5..6e258392 100644 --- a/headphones/encode.py +++ b/headphones/encode.py @@ -50,11 +50,11 @@ def encode(albumPath): logger.warn('Music "%s" has bitrate<="%skbit" will not be reencoded' % (music,headphones.BITRATE)) else: cmd=encoder+' -h --resample ' + str(headphones.SAMPLINGFREQUENCY) + ' -b ' + str(headphones.BITRATE) + cmd=cmd+' '+headphones.ADVANCEDENCODER cmd=cmd+' "'+os.path.join(music)+'"' cmd=cmd+' "'+os.path.join(musicTempFiles[i])+'"' return_code = call(cmd, shell=True) if return_code==0: - #copyID3(music,musicTempFiles[i]) os.remove(music) shutil.move(musicTempFiles[i],os.path.join(albumPath)) else: @@ -64,10 +64,10 @@ def encode(albumPath): cmd=encoder+' -i' cmd=cmd+' "'+os.path.join(music)+'"' cmd=cmd+' -ac 2 -vn -ar ' + str(headphones.SAMPLINGFREQUENCY) + ' -ab ' + str(headphones.BITRATE) +'k' + cmd=cmd+' '+headphones.ADVANCEDENCODER cmd=cmd+' "'+os.path.join(musicTempFiles[i])+'"' return_code = call(cmd, shell=True) if return_code==0: - #copyID3(music,musicTempFiles[i]) os.remove(music) shutil.move(musicTempFiles[i],os.path.join(albumPath))