Pop up an infobox on OS X if Audion isn't found. Thanks to Tim Klein.

Handle a missing Audion better.
minter · Mar 25, 2005 · fe6b7ec · fe6b7ec
1 parent b198862
commit fe6b7ec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,8 @@ Thu  Mar 24 2005	H. Wade Minter (minter@lunenburg.org)
        be used by the version check.
      * Add some prepackaged online searches.
      * Fix an inconsistency in the get_md5 subroutine.
+     * Pop up an infobox on OS X if Audion isn't found.  Thanks to Tim Klein.
+     * Handle a missing Audion better.
 
 Wed  Mar 23 2005	H. Wade Minter (minter@lunenburg.org)
      * Add code to do an XML-RPC version check on start.

diff --git a/mrvoice.pl b/mrvoice.pl
@@ -3306,7 +3306,7 @@ sub launch_tank_playlist
         RunAppleScript(
             qq( set unixFile to \"$filename\"\nset macFile to POSIX file unixFile\nset fileRef to (macFile as alias)\ntell application "Audion 3"\nplay fileRef in control window 1\nend tell)
           )
-          or die "Can't play: $@";
+          or $status = "Audion Error playing $filename";
     }
     else
     {
@@ -3802,7 +3802,7 @@ sub play_mp3
             RunAppleScript(
                 qq( set unixFile to \"$filename\"\nset macFile to POSIX file unixFile\nset fileRef to (macFile as alias)\ntell application "Audion 3"\nplay fileRef in control window 1\nend tell)
               )
-              or die "Can't play: $@";
+              or $status = "Can't play: $@";
         }
         else
         {
@@ -3836,7 +3836,7 @@ sub play_mp3
             RunAppleScript(
                 qq( set unixFile to \"$file\"\nset macFile to POSIX file unixFile\nset fileRef to (macFile as alias)\ntell application "Audion 3"\nplay fileRef in control window 1\nend tell)
               )
-              or die "Can't play: $@";
+              or $status = "Can't play: $@";
         }
         else
         {
@@ -4607,6 +4607,8 @@ sub online_search_window
                     -text => $person_hashref->{$person}{name} );
             }
         )->pack( -side => 'top' );
+        $onlinebox->bind( "<Double-Button-1>",
+            sub { online_download($onlinebox) } );
         $onlinewin->bind(
             "<Key-Return>",
             sub {
@@ -5294,7 +5296,12 @@ sub create_new_database
     elsif ( $^O eq "darwin" )
     {
         print "Starting AppleScript\n" if $debug;
-        RunAppleScript(qq( tell application "Audion 3" to activate)) or die;
+        RunAppleScript(qq( tell application "Audion 3" to activate))
+          or infobox(
+            $mw,
+            "Audion Error",
+            "AppleScript could not find Audion.  You will probably want to download the app and put it in the Applications folder.  Otherwise you will not be able to, in a word, 'play' any music"
+          );
         print "Finished AppleScript\n" if $debug;
     }
     else