""

plugins/XAMP.pl

@@ -12,43 +12,54 @@ my $last_text = "";
 # Some rather kludgy OS-specific code follows
 #
 
+my $code;
 
 if($^O =~ /Win32/)
 {
-    eval '
+
+    $code = <<'END';
     package XAMP;
 
-        use Win32::GuiText qw(FindWindowLike GetWindowText);
+    use Win32::GuiTest qw(FindWindowLike GetWindowText);
 
         sub get_text
-        {
+{
     my ($win) = FindWindowLike(0, "", "Winamp v1.x");
     ($win) = FindWindowLike(0, "", "STUDIO") unless $win;
 
     my $song = GetWindowText($win) if $win;
             
     $song = $song x 2 unless($song =~ m/\d*\. (.*)- Winamp/);
+    
+    $song =~ s/ - Winamp//g;
+    $song =~ s/\d*\.\s*//g;
+    $commit = 1 if $song ne $last_text;
     return $song;
- 	}
-    ';
+}
+1;
+END
 }
 else
 {
-    eval '
-	package XAMP;
-	use Xmms::Remote;
+    $code = '
+package XAMP;
+use Xmms::Remote;
 
-	my $rem = Xmms::Remote->new;
+my $rem = Xmms::Remote->new;
 
-	sub get_text
-	{
+sub get_text
+{
     my $text = $rem->get_playlist_title($rem->get_playlist_pos);
     $commit = 1 if $text ne $last_text;
     return $text;
-	}
-    ' or die $@;
+}
+1;
+    ';
 }
 
+# $code =~ s/\n|\r//g;
+eval $code or die "$! $@ $^E";
+
 sub get_title
 {
     my $text = get_text();
@@ -70,6 +81,7 @@ sub update
     $last_text = $text;
 
     my ($artist, $title) = (get_artist(), get_title());
+    print "artist = $artist; song = $title;\n";
     hook('protocol_mod_prof', -name => '%a', -value => $artist);
     hook('protocol_mod_prof', -name => '%s', -value => $title);
     
@@ -89,8 +101,4 @@ register_hook("signed_in", sub {
     
 });
 
-
-
-
-
-	    
+1;