diff --git a/data/css/style.css b/data/css/style.css
index 202288bf..7641d431 100755
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -109,11 +109,11 @@ header { min-height: 68px; width: 100%; min-width: 935px; padding-left: 0px; pad
h1 { font-size: 24px; }
h2 { font-size: 20px; }
h3 { font-size: 16px; }
-h4 { font-size: 13px; }
+h4 { font-size: 14px; }
p.indented { padding-top: 20px; margin-left: 20px; font-size: 14px; }
p.center { text-align: center; font-size: 18px; }
-.smalltext2 { font-size: 11px; margin-left: 45px; }
+.smalltext2 { font-size: 12px; margin-left: 45px; }
div#updatebar { text-align: center; min-width: 970px; width: 100%; background-color: light-blue; float: left; }
div#logo { float: left; padding-left: 10px; }
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
index 5e513e4b..e9e006e9 100644
--- a/data/interfaces/default/config.html
+++ b/data/interfaces/default/config.html
@@ -277,7 +277,7 @@
Bitrate: kbps
-
Path to Encoder:
+ Path to Encoder:
diff --git a/data/interfaces/remix/config.html b/data/interfaces/remix/config.html
index 4993192d..e9e006e9 100644
--- a/data/interfaces/remix/config.html
+++ b/data/interfaces/remix/config.html
@@ -58,7 +58,7 @@
SABnzbd Host:
- usually localhost:8080
+ usually http://localhost:8080
|
@@ -260,16 +260,24 @@
|
Re-Encoding Options:
- Convert Lossless to mp3
+ Convert Lossless to mp3
Note: this option requires the lame or ffdshow encoder
+ <%
+ if config['encoder'] == 'lame':
+ lameselect = 'selected="selected"'
+ ffdshowselect = ''
+ else:
+ lameselect = ''
+ ffdshowselect = 'selected="selected"'
+ %>
Encoder:
- Bitrate: kbps
+ Bitrate: kbps
- Path to Encoder:
+ Path to Encoder:
|
diff --git a/headphones/__init__.py b/headphones/__init__.py
index a602f53e..6d33b038 100644
--- a/headphones/__init__.py
+++ b/headphones/__init__.py
@@ -256,12 +256,10 @@ def initialize():
ENCODERFOLDER = check_setting_str(CFG, 'General', 'encoderfolder', '')
ENCODER = check_setting_str(CFG, 'General', 'encoder', 'ffmpeg')
- BITRATE = check_setting_int(CFG, 'General', 'bitrate', 128)
+ 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))
-
-
if not LOG_DIR:
LOG_DIR = os.path.join(DATA_DIR, 'logs')
diff --git a/headphones/webserve.py b/headphones/webserve.py
index e77f6eb2..1034a482 100644
--- a/headphones/webserve.py
+++ b/headphones/webserve.py
@@ -304,7 +304,8 @@ class WebInterface(object):
interface_dir = os.path.join(headphones.PROG_DIR, 'data/interfaces/')
interface_list = [ name for name in os.listdir(interface_dir) if os.path.isdir(os.path.join(interface_dir, name)) ]
-
+ print 'Value going in: '
+ print headphones.ENCODER
config = {
"http_host" : headphones.HTTP_HOST,
"http_user" : headphones.HTTP_USERNAME,
@@ -365,7 +366,7 @@ class WebInterface(object):
nzbsorg=0, nzbsorg_uid=None, nzbsorg_hash=None, newzbin=0, newzbin_uid=None, newzbin_password=None, preferred_quality=0, preferred_bitrate=None, detect_bitrate=0, move_files=0,
rename_files=0, correct_metadata=0, cleanup_files=0, add_album_art=0, embed_album_art=0, destination_dir=None, folder_format=None, file_format=None, include_extras=0, interface=None, log_dir=None,
encode=0, encoder=None, bitrate=None, encoderfolder=None):
-
+
headphones.HTTP_HOST = http_host
headphones.HTTP_PORT = http_port
headphones.HTTP_USERNAME = http_username