Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1

CREDITS

@@ -1,6 +1,17 @@
 =======
 CREDITS
 =======
+Version 1.9.3
+-------------
+Same as previous version.
+
+Version 1.9.2
+-------------
+Same as previous version.
+
+Version 1.9.1
+-------------
+Same as previous version.
 
 Version 1.9.0
 -------------

Changelog

@@ -1,3 +1,14 @@
+1.9.3 - August 26th, 2011
+  *Improvements
+    -It is now possible to upgrade your system while a show is playing.
+     Playout will be temporarily interrupted for about 5-10 seconds and then 
+     playout will resume.  Previously playout would not resume until the next
+     scheduled show.
+  *fixes
+    -Fixed bug where playout system did not work with mono files.
+    -Fixed bug where sometimes audio files could be played out of order.
+
+
 1.9.2 - August 23rd, 2011
   *Fixes
     -Fixed restarting sometimes caused media-monitor to forget all of its watched directories

install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

@@ -66,6 +66,7 @@ class AirtimeInstall{
         exec("rm -f /usr/bin/airtime-import");
         exec("rm -f /usr/bin/airtime-update-db-settings");
         exec("rm -f /usr/bin/airtime-check-system");
+        exec("rm -f /usr/bin/airtime-user");
     }
 
     public static function DbTableExists($p_name)

install_minimal/upgrades/airtime-1.9.3/airtime-upgrade.php

@@ -129,7 +129,7 @@
                 }
             }
     
-            $default_suffix = "192";
+            $default_suffix = "193";
             AirtimeIni193::CreateIniFiles($default_suffix);
             AirtimeIni193::MergeConfigFiles($configFiles, $suffix);
         }

python_apps/show-recorder/recorder.py

@@ -155,7 +155,7 @@ class ShowRecorder(Thread):
 
                 self.upload_file(filepath)
                 os.remove(filepath)
-            except Exceptio, e:
+            except Exception, e:
                 self.logger.error(e)
         else:
             self.logger.info("problem recording show")