diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo index 053a99b1a..6785de678 100644 Binary files a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo index 63f34c90b..76942ed77 100644 Binary files a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo index 508a78ec1..4ca8d6170 100644 Binary files a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo index 8071b8426..114eb85d3 100644 Binary files a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo index 3ea37cd3b..696b207b7 100644 Binary files a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo index e6fb352ce..1cd4bb1ac 100644 Binary files a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index 032deff0e..abd94d09d 100644 Binary files a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo differ diff --git a/python_apps/pypo/liquidsoap_scripts/opus.liq b/python_apps/pypo/liquidsoap_scripts/opus.liq index 36082c6fd..3ad6f6c55 100644 --- a/python_apps/pypo/liquidsoap_scripts/opus.liq +++ b/python_apps/pypo/liquidsoap_scripts/opus.liq @@ -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 diff --git a/tests/selenium/Calendar Add Show Skeleton.html b/tests/selenium/Calendar Add Show Skeleton.html index 6ab57a89e..c369c304b 100644 --- a/tests/selenium/Calendar Add Show Skeleton.html +++ b/tests/selenium/Calendar Add Show Skeleton.html @@ -21,6 +21,11 @@ link=Calendar + + waitForTable + css=table.fc-header.0.0 + todayShow + click link=Show @@ -136,7 +141,6 @@ id=add_show_color - diff --git a/tests/selenium/Calendar Skeleton Present.html b/tests/selenium/Calendar Skeleton Present.html index 6aeb2f102..994200394 100644 --- a/tests/selenium/Calendar Skeleton Present.html +++ b/tests/selenium/Calendar Skeleton Present.html @@ -16,16 +16,31 @@ /Library + + selectWindow + null + + clickAndWait link=Calendar + + waitForTable + id=schedule_block_table.0.1 + todayShowNovember 2014dayweekmonthSunMonTueWedThuFriSat26



27



28



29



30



31



1



2



3



4



5



6



7



8



9



10



11



12



13



14



15



16



17



18



19



20



21



22



23



24



25



26



27



28



29



30



1



2



3



4



5



6



11:00 - 15:00Weekend Morning Blues

11:00 - 12:00naregggg

11:00 - 18:00TestNareg

11:00 - 18:00TestNareg

11:50 - 12:55nareg51

11:00 - 18:00TestNareg

11:00 - 16:00Weekend Morning Blues

13:45 - 16:55nareg55

13:45 - 14:57nareg55

15:00 - 15:07nareg88

11:00 - 16:00Weekend Morning Blues

11:00 - 16:00Weekend Morning Blues

12:10 - 14:30nareg4

15:00 - 19:00nareg5

11:00 - 16:00Weekend Morning Blues

11:00 - 16:00Weekend Morning Blues

12:10 - 14:30nareg4

15:00 - 19:00nareg5

11:00 - 16:00Weekend Morning Blues

11:00 - 16:00Weekend Morning Blues
   

12:10 - 14:30nareg4

22:01 - 23:00Untitled Show

23:00 - 0:00Untitled Show
   

15:00 - 19:00nareg5

11:00 - 16:00Weekend Morning Blues
   

11:00 - 16:00Weekend Morning Blues
   

12:10 - 14:30nareg4
   

15:00 - 19:00nareg5
   

11:00 - 16:00Weekend Morning Blues
   

11:00 - 16:00Weekend Morning Blues
   

12:10 - 14:30nareg4
   

15:00 - 19:00nareg5 + verifyElementPresent id=schedule_calendar + + waitForTable + css=table.fc-header.0.2 + dayweekmonth + verifyElementPresent //div[@id='schedule_calendar']/table/tbody/tr/td[3]/span[3]/span/span @@ -46,7 +61,6 @@ //div[@id='schedule_calendar']/table/tbody/tr/td[3]/span/span/span -