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

Took out some media formats for encoding - changed version for master

Browse Source
This commit is contained in:
Remy
2011-08-17 01:20:31 -07:00
parent 5b2307cbc7
commit 59a07ce49e
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@
<tr>
<td>
<h3>Use Black Hole:</h3><input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} />
<h3>Use Black Hole: <input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} /></h3>
</td>
<td>
@@ -104,7 +104,7 @@
<tr>
<td>
<h3>Usenet Retention:</h3><input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40">
<h3>Usenet Retention:<input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40"></h3>
</td>
</tr>
</table>
@@ -266,14 +266,14 @@
<%
if config['encoder'] == 'lame':
lameselect = 'selected="selected"'
ffdshowselect = ''
ffmpegselect = ''
else:
lameselect = ''
ffdshowselect = 'selected="selected"'
ffmpegselect = 'selected="selected"'
%>
<h3>Encoder: <select name="encoder">
<option value="lame" ${lameselect}>lame</option>
<option value="ffdshow" ${ffdshowselect}>ffdshow</option>
<option value="ffmpeg" ${ffmpegselect}>ffmpeg</option>
</select>
Bitrate: <input type="text" name="bitrate" value="${config['bitrate']}" size="3" maxlength="5" />kbps <br>
<br>

10
data/interfaces/remix/config.html
View File

@@ -91,7 +91,7 @@
<tr>
<td>
<h3>Use Black Hole:</h3><input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} />
<h3>Use Black Hole: <input type="checkbox" name="blackhole" value=1 ${config['use_blackhole']} /></h3>
</td>
<td>
@@ -104,7 +104,7 @@
<tr>
<td>
<h3>Usenet Retention:</h3><input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40">
<h3>Usenet Retention:<input type="text" name="usenet_retention" value="${config['usenet_retention']}" size="20" maxlength="40"></h3>
</td>
</tr>
</table>
@@ -266,14 +266,14 @@
<%
if config['encoder'] == 'lame':
lameselect = 'selected="selected"'
ffdshowselect = ''
ffmpegselect = ''
else:
lameselect = ''
ffdshowselect = 'selected="selected"'
ffmpegselect = 'selected="selected"'
%>
<h3>Encoder: <select name="encoder">
<option value="lame" ${lameselect}>lame</option>
<option value="ffdshow" ${ffdshowselect}>ffdshow</option>
<option value="ffmpeg" ${ffmpegselect}>ffmpeg</option>
</select>
Bitrate: <input type="text" name="bitrate" value="${config['bitrate']}" size="3" maxlength="5" />kbps <br>
<br>

2
headphones/encode.py
View File

@@ -25,7 +25,7 @@ def encode(albumPath):
for r,d,f in os.walk(albumPath):
for music in f:
if any(music.endswith('.' + x) for x in headphones.MEDIA_FORMATS):
if any(music.endswith('.' + x) for x in ["flac", "m4a", "wav"]):
musicFiles.append(os.path.join(r, music))
musicTempFiles.append(os.path.join(tempDirEncode, music))

2
headphones/version.py
View File

@@ -1 +1 @@
HEADPHONES_VERSION = "develop"
HEADPHONES_VERSION = "master"

3
headphones/webserve.py
View File

@@ -304,8 +304,7 @@ 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,