gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-03-25 22:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed bitrate config from text to combo box

Browse Source 
changed Sampling Frequency config from text to combo box
Add options from final encode to config
This commit is contained in:
pabloalcantara
2011-08-19 13:50:43 -03:00
parent b95e9eaf4c
commit a2cb87e141
3 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
data/interfaces/default/config.html
View File

@@ -260,7 +260,7 @@
<td>
<h2>Re-Encoding Options:</h2>
<br>
<h3><input type="checkbox" name="encode" value="1" ${config['encode']}/>Convert Lossless to mp3</h3>
<h3><input type="checkbox" name="encode" value="1" ${config['encode']}/>Re-encode Postprocessed Albuns</h3>
<i class="smalltext">Note: this option requires the lame or ffmpeg encoder</i>
<br><br>
<%
@@ -275,8 +275,77 @@
<option value="lame" ${lameselect}>lame</option>
<option value="ffmpeg" ${ffmpegselect}>ffmpeg</option>
</select>
Bitrate: <input type="text" name="bitrate" value="${config['bitrate']}" size="3" maxlength="5" />kbps <br>
<br>
<br>
<%
if config['encoderoutputformat'] == 'mp3':
mp3select = 'selected="selected"'
oggselect = ''
else:
mp3select = ''
oggselect = 'selected="selected"'
%>
<h3>Format: <select name="encoderoutputformat">
<option value="mp3" ${mp3select}>mp3</option>
<option value="ogg" ${oggselect}>ogg</option>
</select>
<br>
<br>
<%
if config["bitrate"] == 64:
bitrate64select = 'selected="selected"'
bitrate128select = ''
bitrate192select = ''
bitrate256select = ''
bitrate320select = ''
elif config["bitrate"] == 128:
bitrate64select = ''
bitrate128select = 'selected="selected"'
bitrate192select = ''
bitrate256select = ''
bitrate320select = ''
elif config["bitrate"] == 192:
bitrate64select = ''
bitrate128select = ''
bitrate192select = 'selected="selected"'
bitrate256select = ''
bitrate320select = ''
elif config["bitrate"] == 256:
bitrate64select = ''
bitrate128select = ''
bitrate192select = ''
bitrate256select = 'selected="selected"'
bitrate320select = ''
else:
bitrate64select = ''
bitrate128select = ''
bitrate192select = ''
bitrate256select = ''
bitrate320select = 'selected="selected"'
%>
<h3>Bitrate: <select name="bitrate">
<option value=64 ${bitrate64select}>64</option>
<option value=128 ${bitrate128select}>128</option>
<option value=192 ${bitrate192select}>192</option>
<option value=256 ${bitrate256select}>256</option>
<option value=320 ${bitrate320select}>320</option>
</select>
<br>
<br>
<%
if config["samplingfrequency"] == 44100:
freq44100 = 'selected="selected"'
freq48000 = ''
else:
freq44100 = ''
freq48000 = 'selected="selected"'
%>
<h3>Sampling: <select name="samplingfrequency">
<option value=44100 ${freq44100}>44100</option>
<option value=48000 ${freq48000}>48000</option>
</select>
<br>
<br>
<h3>Advance Encode Options:</h3><input type="text" name="advancedencoder" value="${config['advancedencoder']}" size="43">
<br>
<h3>Path to Encoder:</h3><input type="text" name="encoderfolder" value="${config['encoderfolder']}" size="43">

4
headphones/__init__.py
View File

@@ -444,8 +444,8 @@ def config_write():
new_config['General']['encode'] = int(ENCODE)
new_config['General']['encoder'] = ENCODER
new_config['General']['bitrate'] = BITRATE
new_config['General']['samplingfrequency'] = SAMPLINGFREQUENCY
new_config['General']['bitrate'] = int(BITRATE)
new_config['General']['samplingfrequency'] = int(SAMPLINGFREQUENCY)
new_config['General']['encoderfolder'] = ENCODERFOLDER
new_config['General']['advancedencoder'] = ADVANCEDENCODER
new_config['General']['encoderoutputformat'] = ENCODEROUTPUTFORMAT

12
headphones/webserve.py
View File

@@ -352,9 +352,11 @@ class WebInterface(object):
"interface_list" : interface_list,
"encode": checked(headphones.ENCODE),
"encoder": headphones.ENCODER,
"bitrate": headphones.BITRATE,
"bitrate": int(headphones.BITRATE),
"encoderfolder": headphones.ENCODERFOLDER,
"advancedencoder": headphones.ADVANCEDENCODER
"advancedencoder": headphones.ADVANCEDENCODER,
"encoderoutputformat": headphones.ENCODEROUTPUTFORMAT,
"samplingfrequency": int(headphones.SAMPLINGFREQUENCY)
}
return serve_template(templatename="config.html", title="Settings", config=config)
config.exposed = True
@@ -365,7 +367,7 @@ class WebInterface(object):
usenet_retention=None, nzbmatrix=0, nzbmatrix_username=None, nzbmatrix_apikey=None, newznab=0, newznab_host=None, newznab_apikey=None,
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, advancedencoder=None):
encode=0, encoder=None, bitrate=None, samplingfrequency=None, encoderfolder=None, advancedencoder=None, encoderoutputformat=None):
headphones.HTTP_HOST = http_host
headphones.HTTP_PORT = http_port
@@ -410,9 +412,11 @@ class WebInterface(object):
headphones.LOG_DIR = log_dir
headphones.ENCODE = encode
headphones.ENCODER = encoder
headphones.BITRATE = bitrate
headphones.BITRATE = int(bitrate)
headphones.SAMPLINGFREQUENCY = int(samplingfrequency)
headphones.ENCODERFOLDER = encoderfolder
headphones.ADVANCEDENCODER = advancedencoder
headphones.ENCODEROUTPUTFORMAT = encoderoutputformat
headphones.config_write()