diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index a3818110..1491144f 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -260,12 +260,13 @@
Re-Encoding Options:
-
- Re-encode downloads during postprocessing
Note: this option requires the lame or ffmpeg encoder
-
- Re-encode only LossLess format (.flac)
-
+
+ Re-encode downloads during postprocessing
+
+
+ Only re-encode lossless files (.flac)
+
<%
if config['encoder'] == 'lame':
lameselect = 'selected="selected"'
@@ -345,13 +346,14 @@
- Advance Encode Options:
+ Advanced Encoding Options:
(ignores audio properties)
Path to Encoder:
+
|
@@ -361,3 +363,30 @@
(Web Interface changes require a restart to take effect)
%def>
+
+<%def name="javascriptIncludes()">
+
+%def>
\ No newline at end of file
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html
index 04c99637..1491144f 100644
--- a/data/interfaces/remix/config.html
+++ b/data/interfaces/remix/config.html
@@ -260,12 +260,13 @@
Re-Encoding Options:
-
- Re-encode downloads during postprocessing
Note: this option requires the lame or ffmpeg encoder
-
- Re-encode only LossLess format (.flac)
-
+
+ Re-encode downloads during postprocessing
+
+
+ Only re-encode lossless files (.flac)
+
<%
if config['encoder'] == 'lame':
lameselect = 'selected="selected"'
@@ -291,6 +292,7 @@
%endfor
+
Audio Properties:
VBR/CBR:
- Advance Encode Options:
+ Advanced Encoding Options:
(ignores audio properties)
-
+
+
Path to Encoder:
+
|
@@ -359,3 +363,30 @@
(Web Interface changes require a restart to take effect)
%def>
+
+<%def name="javascriptIncludes()">
+
+%def>
\ No newline at end of file
diff --git a/headphones/__init__.py b/headphones/__init__.py
index eeec7ed3..a2a2d538 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -122,7 +122,7 @@ ADVANCEDENCODER = None
ENCODEROUTPUTFORMAT = None
ENCODERQUALITY = None
ENCODERVBRCBR = None
-ENCODERLOSSLESS = True
+ENCODERLOSSLESS = False
def CheckSection(sec):
""" Check if INI section exists, if not create it """
@@ -182,7 +182,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, ADVANCEDENCODER, ENCODEROUTPUTFORMAT, ENCODERQUALITY, ENCODERVBRVBR, \
+ ENCODERFOLDER, ENCODER, BITRATE, SAMPLINGFREQUENCY, ENCODE, ADVANCEDENCODER, ENCODEROUTPUTFORMAT, ENCODERQUALITY, ENCODERVBRCBR, \
ENCODERLOSSLESS
if __INITIALIZED__:
@@ -272,7 +272,7 @@ def initialize():
ENCODE = bool(check_setting_int(CFG, 'General', 'encode', 0))
ADVANCEDENCODER = check_setting_str(CFG, 'General', 'advancedencoder', '')
ENCODEROUTPUTFORMAT = check_setting_str(CFG, 'General', 'encoderoutputformat', 'mp3')
- ENCODERQUALITY = check_setting_int(CFG, 'General', 'vorbisquality', 5)
+ ENCODERQUALITY = check_setting_int(CFG, 'General', 'encoderquality', 2)
ENCODERVBRCBR = check_setting_str(CFG, 'General', 'encodervbrcbr', 'cbr')
ENCODERLOSSLESS = bool(check_setting_int(CFG, 'General', 'encoderlossless', 1))
diff --git a/headphones/webserve.py b/headphones/webserve.py
index 7ec86da6..27de859f 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -357,9 +357,9 @@ class WebInterface(object):
"encoderfolder": headphones.ENCODERFOLDER,
"advancedencoder": headphones.ADVANCEDENCODER,
"encoderoutputformat": headphones.ENCODEROUTPUTFORMAT,
- "samplingfrequency": int(headphones.SAMPLINGFREQUENCY),
- "encodervbrcbr": (headphones.ENCODERVBRCBR),
- "encoderquality": int(headphones.ENCODERQUALITY),
+ "samplingfrequency": headphones.SAMPLINGFREQUENCY,
+ "encodervbrcbr": headphones.ENCODERVBRCBR,
+ "encoderquality": headphones.ENCODERQUALITY,
"encoderlossless": checked(headphones.ENCODERLOSSLESS)
}
return serve_template(templatename="config.html", title="Settings", config=config)