Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x' into saas

Browse source
This commit is contained in:
Albert Santoni 2014-12-15 10:50:25 -05:00
commit d5fc90e9d3
10 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

BIN
airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

BIN
airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

BIN
airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

BIN
airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

BIN
airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

BIN
airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

44
python_apps/pypo/liquidsoap_scripts/opus.liq
View file

@ -1,68 +1,68 @@
if bitrate == 24 then
if stereo then
ignore(output_stereo(%opus(bitrate = 24, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 24, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 24, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 24, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 32 then
if stereo then
ignore(output_stereo(%opus(bitrate = 32, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 32, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 32, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 32, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 48 then
if stereo then
ignore(output_stereo(%opus(bitrate = 48, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 48, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 48, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 48, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 64 then
if stereo then
ignore(output_stereo(%opus(bitrate = 64, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 64, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 64, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 64, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 96 then
if stereo then
ignore(output_stereo(%opus(bitrate = 96, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 96, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 96, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 96, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 128 then
if stereo then
ignore(output_stereo(%opus(bitrate = 128, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 128, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 128, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 128, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 160 then
if stereo then
ignore(output_stereo(%opus(bitrate = 160, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 160, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 160, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 160, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 192 then
if stereo then
ignore(output_stereo(%opus(bitrate = 192, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 192, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 192, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 192, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 224 then
if stereo then
ignore(output_stereo(%opus(bitrate = 224, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 224, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 224, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 224, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 256 then
if stereo then
ignore(output_stereo(%opus(bitrate = 256, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 256, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 256, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 256, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
elsif bitrate == 320 then
if stereo then
ignore(output_stereo(%opus(bitrate = 320, channels = 2), !source))
ignore(output_stereo(%opus(bitrate = 320, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
else
ignore(output_mono(%opus(bitrate = 320, channels = 1), mean(!source)))
ignore(output_mono(%opus(bitrate = 320, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
end
end

6
tests/selenium/Calendar Add Show Skeleton.html
View file

@ -21,6 +21,11 @@
<td>link=Calendar</td>
<td></td>
</tr>
<tr>
<td>waitForTable</td>
<td>css=table.fc-header.0.0</td>
<td>todayShow</td>
</tr>
<tr>
<td>click</td>
<td>link=Show</td>
@ -136,7 +141,6 @@
<td>id=add_show_color</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>

16
tests/selenium/Calendar Skeleton Present.html
View file

@ -16,16 +16,31 @@
<td>/Library</td>
<td></td>
</tr>
<tr>
<td>selectWindow</td>
<td>null</td>
<td></td>
</tr>
<tr>
<td>clickAndWait</td>
<td>link=Calendar</td>
<td></td>
</tr>
<tr>
<td>waitForTable</td>
<td>id=schedule_block_table.0.1</td>
<td>todayShowNovember 2014dayweekmonthSunMonTueWedThuFriSat26<br /> <br /><br /><br />27<br /> <br /><br /><br />28<br /> <br /><br /><br />29<br /> <br /><br /><br />30<br /> <br /><br /><br />31<br /> <br /><br /><br />1<br /> <br /><br /><br />2<br /> <br /><br /><br />3<br /> <br /><br /><br />4<br /> <br /><br /><br />5<br /> <br /><br /><br />6<br /> <br /><br /><br />7<br /> <br /><br /><br />8<br /> <br /><br /><br />9<br /> <br /><br /><br />10<br /> <br /><br /><br />11<br /> <br /><br /><br />12<br /> <br /><br /><br />13<br /> <br /><br /><br />14<br /> <br /><br /><br />15<br /> <br /><br /><br />16<br /> <br /><br /><br />17<br /> <br /><br /><br />18<br /> <br /><br /><br />19<br /> <br /><br /><br />20<br /> <br /><br /><br />21<br /> <br /><br /><br />22<br /> <br /><br /><br />23<br /> <br /><br /><br />24<br /> <br /><br /><br />25<br /> <br /><br /><br />26<br /> <br /><br /><br />27<br /> <br /><br /><br />28<br /> <br /><br /><br />29<br /> <br /><br /><br />30<br /> <br /><br /><br />1<br /> <br /><br /><br />2<br /> <br /><br /><br />3<br /> <br /><br /><br />4<br /> <br /><br /><br />5<br /> <br /><br /><br />6<br /> <br /><br /><br />11:00 - 15:00Weekend Morning Blues<br /><br />11:00 - 12:00naregggg<br /><br />11:00 - 18:00TestNareg<br /><br />11:00 - 18:00TestNareg<br /><br />11:50 - 12:55nareg51<br /><br />11:00 - 18:00TestNareg<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />13:45 - 16:55nareg55<br /><br />13:45 - 14:57nareg55<br /><br />15:00 - 15:07nareg88<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />12:10 - 14:30nareg4<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />12:10 - 14:30nareg4<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br /><br />22:01 - 23:00Untitled Show<br /><br />23:00 - 0:00Untitled Show<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5</td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>id=schedule_calendar</td>
<td></td>
</tr>
<tr>
<td>waitForTable</td>
<td>css=table.fc-header.0.2</td>
<td>dayweekmonth</td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>//div[@id='schedule_calendar']/table/tbody/tr/td[3]/span[3]/span/span</td>
@ -46,7 +61,6 @@
<td>//div[@id='schedule_calendar']/table/tbody/tr/td[3]/span/span/span</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>