From 6cc366b1000347df8b1667f97a90e5e9d5931ea5 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 26 Apr 2013 13:43:40 -0400
Subject: [PATCH] CC-5069: Airtime 2.4 upgrade scripts

-initial commit
---
 airtime_mvc/build/sql/defaultdata.sql                      | 2 +-
 install_minimal/include/airtime-constants.php              | 2 +-
 install_minimal/include/airtime-upgrade.php                | 4 ++++
 install_minimal/upgrades/airtime-2.4.0/airtime-upgrade.php | 0
 install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql    | 5 +++++
 python_apps/api_clients/api_client.py                      | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 install_minimal/upgrades/airtime-2.4.0/airtime-upgrade.php
 create mode 100644 install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql

diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index 0af91c7fd..ff4fe2d6b 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -11,7 +11,7 @@ INSERT INTO cc_live_log("state", "start_time") VALUES('S', now() at time zone 'U
 -- end of added in 2.1
 
 -- added in 2.0.0
-INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_type', 'ogg, mp3');
+INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_type', 'ogg, mp3, opus');
 INSERT INTO cc_pref("keystr", "valstr") VALUES('stream_bitrate', '24, 32, 48, 64, 96, 128, 160, 192, 224, 256, 320');
 INSERT INTO cc_pref("keystr", "valstr") VALUES('num_of_streams', '3');
 INSERT INTO cc_pref("keystr", "valstr") VALUES('max_bitrate', '320');
diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 10c620da9..c3f6aaaaa 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.3.1');
+define('AIRTIME_VERSION', '2.4.0');
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index ee33d0662..07db3f1e9 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -80,4 +80,8 @@ if (strcmp($version, "2.3.1") < 0) {
     passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.3.1/airtime-upgrade.php");
     pause();
 }
+if (strcmp($version, "2.4.0") < 0) {
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.4.0/airtime-upgrade.php");
+    pause();
+}
 echo "******************************* Upgrade Complete *******************************".PHP_EOL;
diff --git a/install_minimal/upgrades/airtime-2.4.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.4.0/airtime-upgrade.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql
new file mode 100644
index 000000000..aad478aa0
--- /dev/null
+++ b/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql
@@ -0,0 +1,5 @@
+DELETE FROM cc_pref WHERE keystr = 'system_version';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0');
+
+DELETE FROM cc_pref WHERE keystr = 'stream_type';
+INSERT INTO cc_pref (keystr, valstr) VALUES ('stream_type', 'ogg, mp3, opus');
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 79860adfe..89167acdc 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -16,7 +16,7 @@ import base64
 import traceback
 from configobj import ConfigObj
 
-AIRTIME_VERSION = "2.3.1"
+AIRTIME_VERSION = "2.4.0"
 
 
 # TODO : Place these functions in some common module. Right now, media