From cd49f99f4bb3e711459abf26cda150055f3f9d8d Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 30 Aug 2012 11:29:23 -0400 Subject: [PATCH] CC-3412: Icecast stream name not defined -ensure upgrade --- airtime_mvc/build/sql/defaultdata.sql | 14 +++++++------- .../upgrades/airtime-2.2.0/data/upgrade.sql | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql index 0c4729523..b43028a71 100644 --- a/airtime_mvc/build/sql/defaultdata.sql +++ b/airtime_mvc/build/sql/defaultdata.sql @@ -1,11 +1,5 @@ INSERT INTO cc_subjs ("login", "type", "pass") VALUES ('admin', 'A', md5('admin')); --- added in 2.2 --- INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_name', 'Airtime!', 'string'); --- INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_name', '', 'string'); --- INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_name', '', 'string'); --- end of added in 2.2 - -- added in 2.1 INSERT INTO cc_pref("keystr", "valstr") VALUES('scheduled_play_switch', 'on'); @@ -304,7 +298,13 @@ INSERT INTO cc_country (isocode, name) VALUES ('ZMB', 'Zambia '); INSERT INTO cc_country (isocode, name) VALUES ('ZWE', 'Zimbabwe '); +-- added in 2.2 +INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s1_name', 'Airtime!', 'string'); +INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s2_name', '', 'string'); +INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s3_name', '', 'string'); + + INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s1_channels', 'stereo', 'string'); INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s2_channels', 'stereo', 'string'); INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s3_channels', 'stereo', 'string'); - +-- end of added in 2.2 diff --git a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql index d385d148f..aad2502f3 100644 --- a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql @@ -2,6 +2,10 @@ DELETE FROM cc_pref WHERE keystr = 'system_version'; INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.2.0'); +INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s1_name', 'Airtime!', 'string'); +INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s2_name', '', 'string'); +INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s3_name', '', 'string'); + INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s1_channels', 'stereo', 'string'); INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s2_channels', 'stereo', 'string'); INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s3_channels', 'stereo', 'string');