From 48ae8ac69c7adf923ed21b397db229799368fe5d Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 19 Nov 2014 14:10:53 -0500 Subject: [PATCH 1/7] Scheduler->removeItems optimization --- airtime_mvc/application/models/Scheduler.php | 50 +++++++------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 39415beaa..05b55bdba 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -1112,9 +1112,12 @@ class Application_Model_Scheduler $removedItems = CcScheduleQuery::create()->findPks($scheduledIds); - //check to make sure all items selected are up to date - foreach ($removedItems as $removedItem) { + // This array is used to keep track of every show instance that was + // effected by the track deletion. It will be used later on to + // remove gaps in the schedule and adjust crossfade times. + $effectedInstanceIds = array(); + foreach ($removedItems as $removedItem) { $instance = $removedItem->getCcShowInstances($this->con); //check if instance is linked and if so get the schedule items @@ -1122,25 +1125,22 @@ class Application_Model_Scheduler if (!$cancelShow && $instance->getCcShow()->isLinked()) { //returns all linked instances if linked $ccShowInstances = $this->getInstances($instance->getDbId()); + $instanceIds = array(); foreach ($ccShowInstances as $ccShowInstance) { $instanceIds[] = $ccShowInstance->getDbId(); } - /* - * Find all the schedule items that are in the same position - * as the selected item by the user. - * The position of each track is the same across each linked instance - */ + $effectedInstanceIds = array_merge($effectedInstanceIds, $instanceIds); + + // Delete the same track, represented by $removedItem, in + // each linked show instance. $itemsToDelete = CcScheduleQuery::create() ->filterByDbPosition($removedItem->getDbPosition()) ->filterByDbInstanceId($instanceIds, Criteria::IN) - ->find(); - foreach ($itemsToDelete as $item) { - if (!$removedItems->contains($item)) { - $removedItems->append($item); - } - } + ->filterByDbId($removedItem->getDbId(), Criteria::NOT_EQUAL) + ->delete($this->con); } + //check to truncate the currently playing item instead of deleting it. if ($removedItem->isCurrentItem($this->epochNow)) { @@ -1165,29 +1165,11 @@ class Application_Model_Scheduler } else { $removedItem->delete($this->con); } - - // update is_scheduled in cc_files but only if - // the file is not scheduled somewhere else - $fileId = $removedItem->getDbFileId(); - // check if the removed item is scheduled somewhere else - $futureScheduledFiles = Application_Model_Schedule::getAllFutureScheduledFiles(); - if (!is_null($fileId) && !in_array($fileId, $futureScheduledFiles)) { - $db_file = CcFilesQuery::create()->findPk($fileId, $this->con); - $db_file->setDbIsScheduled(false)->save($this->con); - } } + Application_Model_StoredFile::updatePastFilesIsScheduled(); if ($adjustSched === true) { - //get the show instances of the shows we must adjust times for. - foreach ($removedItems as $item) { - - $instance = $item->getDBInstanceId(); - if (!in_array($instance, $showInstances)) { - $showInstances[] = $instance; - } - } - - foreach ($showInstances as $instance) { + foreach ($effectedInstanceIds as $instance) { $this->removeGaps($instance); $this->calculateCrossfades($instance); } @@ -1195,7 +1177,7 @@ class Application_Model_Scheduler //update the status flag in cc_schedule. $instances = CcShowInstancesQuery::create() - ->filterByPrimaryKeys($showInstances) + ->filterByPrimaryKeys($effectedInstanceIds) ->find($this->con); foreach ($instances as $instance) { From 00fbda193e2e0ccd6459eb5dc0a37888e4d7e4e2 Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 19 Nov 2014 17:09:54 -0500 Subject: [PATCH 2/7] Schedule->removeItems optimization fix for deleting the current playing track --- airtime_mvc/application/models/Scheduler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 05b55bdba..4208ff5c7 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -1119,6 +1119,7 @@ class Application_Model_Scheduler foreach ($removedItems as $removedItem) { $instance = $removedItem->getCcShowInstances($this->con); + $effectedInstanceIds[] = $instance->getDbId(); //check if instance is linked and if so get the schedule items //for all linked instances so we can delete them too From 3d0d148169ad4943d1bd28ef4a229b9461c511e6 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 24 Nov 2014 10:44:36 -0500 Subject: [PATCH 3/7] Fix race condition in selenium tests --- tests/selenium/Calendar Add Show Skeleton.html | 6 +++++- tests/selenium/Calendar Skeleton Present.html | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) 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 - From 37e358630d1999dcce423f797c7ed1452fcf068c Mon Sep 17 00:00:00 2001 From: localizer Date: Thu, 27 Nov 2014 14:57:16 +0000 Subject: [PATCH 4/7] updated translation resources --- airtime_mvc/locale/az/LC_MESSAGES/airtime.mo | Bin 474 -> 474 bytes airtime_mvc/locale/az/LC_MESSAGES/airtime.po | 2 +- .../locale/en_GB/LC_MESSAGES/airtime.mo | Bin 61416 -> 61416 bytes .../locale/en_GB/LC_MESSAGES/airtime.po | 2 +- airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo | Bin 69391 -> 69372 bytes airtime_mvc/locale/ja/LC_MESSAGES/airtime.po | 6 +++--- .../locale/pt_BR/LC_MESSAGES/airtime.mo | Bin 57883 -> 57870 bytes .../locale/pt_BR/LC_MESSAGES/airtime.po | 5 +++-- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo index 053a99b1a5fc3bd50f39cd2cc5545461dc72ea3c..23a98f3a06facf94ddfd429e3c0f84da24e6dc25 100644 GIT binary patch delta 16 Xcmcb`e2aO)CRRgpD+9xg+m#ssG}Hx= delta 16 Xcmcb`e2aO)CRPJWD^rV&+m#ssH5>(= diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po index 20bb72ce5..c131a5523 100644 --- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-11-14 17:01+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo index 508a78ec1b08b9d57f80d079edbc1eb3f83a5575..12e367d13a3f60dd499c7cb9caac05118b1279ba 100644 GIT binary patch delta 23 fcmaEHpZUdo<_(3jIE>5{3{9*|%{Eug$`1tqewYb$ delta 23 fcmaEHpZUdo<_(3jI1Eh`3=OPIjW$=#$`1tqek%!S diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po index 72cfe863e..4bda8e822 100644 --- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 10:52+0000\n" +"PO-Revision-Date: 2014-11-27 14:56+0000\n" "Last-Translator: Daniel James \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo index 3ea37cd3b262ae2f56f0b9e865946844313c38a1..696b207b72d1007025b11f395ba8bfbec7c89c29 100644 GIT binary patch delta 16882 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 diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po index b847a5265..d9398df2c 100644 --- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2014-11-14 16:45+0000\n" +"Last-Translator: asantoni_sourcefabric \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2737,7 +2737,7 @@ msgstr "Liquidsoapに問題があります。" #: airtime_mvc/application/configs/navigation.php:12 msgid "Now Playing" -msgstr "Now Playing" +msgstr "" #: airtime_mvc/application/configs/navigation.php:19 msgid "Add Media" diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index 032deff0e1767dda900d6d5f629a0496103ca77d..62d29d3100e676ad4459b52900d821d6d976a77a 100644 GIT binary patch delta 6140 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 l8#sF6_*~yZI`#&%rBa;9C diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index 1ebeb7078..9eb096560 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Airtime package. # # Translators: +# Felipe Thomaz Pedroni, 2014 # Pedro Garbellini da Silva , 2014 # Sourcefabric , 2012 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2014-11-18 01:50+0000\n" +"Last-Translator: Felipe Thomaz Pedroni\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From cceddd57d8477f25d8620c007ad2be9c64070d4a Mon Sep 17 00:00:00 2001 From: localizer Date: Fri, 5 Dec 2014 10:33:17 +0000 Subject: [PATCH 5/7] updated translation resources --- airtime_mvc/locale/az/LC_MESSAGES/airtime.mo | Bin 474 -> 474 bytes airtime_mvc/locale/az/LC_MESSAGES/airtime.po | 2 +- .../locale/de_AT/LC_MESSAGES/airtime.mo | Bin 63465 -> 63465 bytes .../locale/de_AT/LC_MESSAGES/airtime.po | 2 +- .../locale/en_GB/LC_MESSAGES/airtime.mo | Bin 61416 -> 61416 bytes .../locale/en_GB/LC_MESSAGES/airtime.po | 2 +- .../locale/hy_AM/LC_MESSAGES/airtime.mo | Bin 487 -> 487 bytes .../locale/hy_AM/LC_MESSAGES/airtime.po | 2 +- airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo | Bin 464 -> 464 bytes airtime_mvc/locale/ka/LC_MESSAGES/airtime.po | 2 +- .../locale/pt_BR/LC_MESSAGES/airtime.mo | Bin 57870 -> 57870 bytes .../locale/pt_BR/LC_MESSAGES/airtime.po | 2 +- 12 files changed, 6 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo index 23a98f3a06facf94ddfd429e3c0f84da24e6dc25..6785de6785149cddaf880a948303f9c10017b49c 100644 GIT binary patch delta 21 ccmcb`e2aO)S}r4915*V<11n>rjoXzO0ZxPlasU7T delta 21 ccmcb`e2aO)S}sFfLlXr\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo index 63f34c90b06ae024f66f0ee2fa3b0277915c3f93..76942ed77169f8cb72764aaff613ab588c18a207 100644 GIT binary patch delta 25 hcmaF)p84f_<_#Ywa~bIxm?{_=SQ#5_{yq6!G60;{3u^!X delta 25 hcmaF)p84f_<_#Ywa~bLynkX1pTA5mG{yq6!G60=I3wi(m diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po index 332e5e7ca..d9ad52eea 100644 --- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/airtime/language/de_AT/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo index 12e367d13a3f60dd499c7cb9caac05118b1279ba..4ca8d6170c591ca8352b180d8743e6454998c90c 100644 GIT binary patch delta 25 hcmaEHpZUdo<_-C?xQuiSOce|btc;B|SI){01ptmL3B~{b delta 25 hcmaEHpZUdo<_-C?xD0iT%oPkxtW3=|SI){01ptnj3DW=o diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po index 4bda8e822..c17dfe604 100644 --- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-27 14:56+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo index 8071b842605e57e82e35bc6a841a38df50ad8afd..114eb85d3a4f4bb0562bd40b8d65cead176f84ef 100644 GIT binary patch delta 21 ccmaFP{G55hS}r4915*V<11n>rjoS?v0Z^s}nE(I) delta 21 ccmaFP{G55hS}sFfLlXr9ODj{0joS?v0Z{@5r~m)} diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po index 53eec4c52..4b1c353b4 100644 --- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/airtime/language/hy_AM/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo index e6fb352ce67bbf31d430a99d83d12ff86f5ee15c..1cd4bb1acc82b4cd0c1fbbd2905c7f1a2fb944b6 100644 GIT binary patch delta 21 ccmcb>e1UnwS}r4915*V<11n>rjoT#|0ZiZqQ~&?~ delta 21 ccmcb>e1UnwS}sFfLlXr9ODj{0joT#|0ZlvxV*mgE diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po index d2735f640..6cfc03736 100644 --- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/airtime/language/ka/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index 62d29d3100e676ad4459b52900d821d6d976a77a..abd94d09de69dd70d843750bc615c04bec577c82 100644 GIT binary patch delta 25 gcmeA>!rXU+d4op>myxc4se++_m9f$0ppHF}0Cd9$y8r+H delta 25 gcmeA>!rXU+d4op>m!Ynqg@S>hm8rqzppHF}0CeUEz5oCK diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index 9eb096560..84a24f16f 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-18 01:50+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Felipe Thomaz Pedroni\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n" "MIME-Version: 1.0\n" From 3b88b0ce22c2025b448f682283211468b84d7fe8 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 15 Dec 2014 10:42:45 -0500 Subject: [PATCH 6/7] Boost the Opus sound quality --- python_apps/pypo/liquidsoap_scripts/opus.liq | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/opus.liq b/python_apps/pypo/liquidsoap_scripts/opus.liq index 36082c6fd..9cd81c627 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), 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), !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), mean(!source))) end end From 8766519c71d4836241825ef43141cc76dad0f339 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 15 Dec 2014 10:49:21 -0500 Subject: [PATCH 7/7] Another tweak to Opus sound quality. Liquidsoap picks undocumented poor defaults for almost every encoder. --- python_apps/pypo/liquidsoap_scripts/opus.liq | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/opus.liq b/python_apps/pypo/liquidsoap_scripts/opus.liq index 9cd81c627..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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), 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, signal="music", application="audio", complexity=10), !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, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 320, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end end