From ac6c279befd23a196045ade0cab72de62c4b94a7 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 21 Jan 2013 20:20:29 -0500 Subject: [PATCH 1/6] Removed extra '/' is audio preview url --- airtime_mvc/application/controllers/AudiopreviewController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index 0e4015f38..e094a7450 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -46,7 +46,7 @@ class AudiopreviewController extends Zend_Controller_Action } if ($type == "audioclip") { - $uri = $baseUrl."/api/get-media/file/".$audioFileID; + $uri = $baseUrl."api/get-media/file/".$audioFileID; $media = Application_Model_StoredFile::Recall($audioFileID); $mime = $media->getPropelOrm()->getDbMime(); } elseif ($type == "stream") { From 76e7cc87a8608be623b08f42ffe98089001ef162 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 22 Jan 2013 12:34:42 +0000 Subject: [PATCH 2/6] Added Silan to list of third party code used by Airtime --- LICENSE_3RD_PARTY | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY index b32dd6d06..fcdb681a4 100644 --- a/LICENSE_3RD_PARTY +++ b/LICENSE_3RD_PARTY @@ -141,6 +141,12 @@ Non-linked code: - Web site: http://www.python.org/ - License: PSF License. See http://docs.python.org/license.html + * Silan + - What is it: Silence detector + - Web site: https://github.com/x42/silan + - License: GPL-2+ + - Compatible with GPLv3? Yes. + ------------- Show Recorder ------------- From a0685c5479a4ff86ccad53ecd3eb2919ca7b3be4 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 22 Jan 2013 12:39:15 +0000 Subject: [PATCH 3/6] We are using Liquidsoap 1.0.1 now --- LICENSE_3RD_PARTY | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/LICENSE_3RD_PARTY b/LICENSE_3RD_PARTY index fcdb681a4..e48f0b314 100644 --- a/LICENSE_3RD_PARTY +++ b/LICENSE_3RD_PARTY @@ -181,8 +181,6 @@ Non-linked code: - Web site: http://www.python.org/ - License: PSF License. See http://docs.python.org/license.html - * Liquidsoap 1.0.0 + * Liquidsoap 1.0.1 - Web site: http://savonet.sourceforge.net/ - License: GPLv2 - - From eaafcfe2696bf7c29f3c2616b02fba46f863c884 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 22 Jan 2013 12:48:44 +0000 Subject: [PATCH 4/6] Update snapshot script and files for 2.3.0 release --- debian/changelog | 22 ++++++++++++++++++++-- debian/control | 1 + gen-snapshot.sh | 7 +++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1459c3a63..137c4a1b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,26 @@ +airtime (2.3.0-1) unstable; urgency=low + + * Nightly development snapshot of Airtime 2.3.x + + -- Daniel James Tue, 22 Jan 2013 11:44:57 +0000 + +airtime (2.2.1-1) unstable; urgency=low + + * Upstream 2.2.1 release + + -- Daniel James Tue, 04 Dec 2012 11:10:37 +0000 + +airtime (2.2.0-2) unstable; urgency=low + + * Added dependency on flac package for metaflac support + + -- Daniel James Mon, 05 Nov 2012 10:54:49 +0000 + airtime (2.2.0-1) unstable; urgency=low - * Nightly development snapshot of Airtime 2.2.x + * Upstream 2.2.0 release - -- Daniel James Thu, 02 Aug 2012 11:19:03 +0100 + -- Daniel James Fri, 26 Oct 2012 10:44:06 +0100 airtime (2.1.3-2) unstable; urgency=low diff --git a/debian/control b/debian/control index c7263e7fb..4a8ad6e96 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,7 @@ Depends: apache2, pwgen, python, rabbitmq-server, + silan, sudo, sysv-rc, tar (>= 1.22), diff --git a/gen-snapshot.sh b/gen-snapshot.sh index bc5dd051a..7702caaf2 100755 --- a/gen-snapshot.sh +++ b/gen-snapshot.sh @@ -3,7 +3,6 @@ # Run from the directory containg the files checked out from git VERSION=2.3.0~$(date "+%Y%m%d") -#VERSION=2.2.0-rc1 BUILDDEST=/tmp/airtime-${VERSION}/ DEBDIR=`pwd`/debian @@ -24,9 +23,9 @@ cd ${BUILDDEST} || exit # Set the version of the snapshot package -sed -i "1s:(2.2.0-1):(${VERSION}):g" debian/changelog +sed -i "1s:(2.3.0-1):(${VERSION}):g" debian/changelog -# FIXES for 2.2.0 ############# +# FIXES for 2.3.0 ############# # these are all moved to debian/copyright rm airtime/python_apps/pypo/LICENSE @@ -35,7 +34,7 @@ rm airtime/airtime_mvc/library/phing/LICENSE rm airtime/airtime_mvc/library/propel/LICENSE rm airtime/airtime_mvc/library/soundcloud-api/README.md -# Remove Liquidsoap binaries +# Remove Liquidsoap binary rm -r airtime/python_apps/pypo/liquidsoap_bin/ #Remove phing library From 77b0c21192dcba95bc18b95223edd95dfca14ab0 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 22 Jan 2013 10:39:20 -0500 Subject: [PATCH 5/6] Small refactor --- airtime_mvc/application/models/Block.php | 6 ++---- airtime_mvc/application/models/Playlist.php | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 1bf8a8de8..7053e658d 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -378,10 +378,8 @@ SQL; $row->setDbCliplength($info["cliplength"]); $row->setDbCuein($info["cuein"]); $row->setDbCueout($info["cueout"]); - $info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]); - $info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]); - $row->setDbFadein($info["fadein"]); - $row->setDbFadeout($info["fadeout"]); + $row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"])); + $row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"])); $row->save($this->con); // above save result update on cc_block table on length column. // but $this->block doesn't get updated automatically diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index c822ba802..1c446f182 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -348,10 +348,8 @@ SQL; $row->setDbCliplength($info["cliplength"]); $row->setDbCuein($info["cuein"]); $row->setDbCueout($info["cueout"]); - $info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]); - $info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]); - $row->setDbFadein($info["fadein"]); - $row->setDbFadeout($info["fadeout"]); + $row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"])); + $row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"])); if ($info["ftype"] == "audioclip") { $row->setDbFileId($info["id"]); $type = 0; From 64051179f33685a0c0c765ca8da07e1bbe48851c Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 22 Jan 2013 17:19:56 +0000 Subject: [PATCH 6/6] Set Icecast admin password in defaultdata.sql so that stats work out of the box --- debian/postinst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index 99291f1b1..e6d5169f1 100755 --- a/debian/postinst +++ b/debian/postinst @@ -12,7 +12,7 @@ includefile="${configdir}/apache.conf" a2tplfile="${configdir}/apache.vhost.tpl" phpinifile="${configdir}/airtime.ini" OLDVERSION="$2" -NEWVERSION="2.2.0" +NEWVERSION="2.3.0" case "$1" in configure|reconfigure) @@ -126,6 +126,11 @@ case "$1" in ICESOURCE=$RET sed -i "s:'s1_pass', 'hackme', 'string':'s1_pass', '$ICESOURCE', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql + db_get airtime/icecast-adminpw + ICEADMIN=$RET + sed -i "s:'s1_admin_user', '', 'string':'s1_admin_user', 'admin', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql + sed -i "s:'s1_admin_pass', '', 'string':'s1_admin_pass', '$ICEADMIN', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql + else echo "The icecast2 package does not appear to be installed on this server." fi