Move argument parsing into script

diff --git a/lib/App/XMMS2/Notifier.pm b/lib/App/XMMS2/Notifier.pm
index d04b638abc192b126291b5df501a1bffae6a7395..f61a74aee26ddb10934cc2e0ddd329d27a691b3f 100644 (file)
--- a/lib/App/XMMS2/Notifier.pm
+++ b/lib/App/XMMS2/Notifier.pm
@@ -7,18 +7,11 @@ our $VERSION = 0.001001;
 use Audio::XMMSClient 0.03;
 use Gtk2::Notify 0.05 -init,'xmms2-notifyd';
 
-use Getopt::Long;
-
 use constant CONVERSION_SPECIFIERS => qw/bitrate date sample_format url id channels samplerate tracknr genre artist album title/;
 
 ##################################################
 
-my $format = '$artist - $title';
-
-GetOptions (
-       "format=s" => \$format,
-);
-
+my $format;
 my $xmms = Audio::XMMSClient->new('xmms2-notifyd');
 my $notify = Gtk2::Notify->new('');
 
@@ -53,6 +46,7 @@ sub on_playback_status {
 }
 
 sub run {
+       $format = $_[0];
        while (1) {
                last if ($xmms->connect);
                sleep 1

diff --git a/xmms2-notifier b/xmms2-notifier
index 262d6b5adb38d9d1c357bb9c12714e0e107e6ce6..a4812ae1e487bfdc2e062375983836ab69ad140d 100755 (executable)
--- a/xmms2-notifier
+++ b/xmms2-notifier
@@ -3,8 +3,11 @@ use v5.14;
 use warnings;
 
 use App::XMMS2::Notifier;
+use Getopt::Long;
 
-App::XMMS2::Notifier->run
+my $format = '$artist - $title';
+GetOptions ("format=s" => \$format);
+App::XMMS2::Notifier::run($format)
 
 __END__