From 9555e80187ce5bdbb97d81ae623c009a7b33a963 Mon Sep 17 00:00:00 2001
From: milkbone57 <milkbone57>
Date: Sat, 19 Jul 2003 15:38:17 +0000
Subject: [PATCH] ""

---
 plugins/XAMP.pl | 92 +++++++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/plugins/XAMP.pl b/plugins/XAMP.pl
index 709d358..719fd0e 100644
--- a/plugins/XAMP.pl
+++ b/plugins/XAMP.pl
@@ -12,55 +12,66 @@ my $last_text = "";
 # Some rather kludgy OS-specific code follows
 #
 
+my $code;
 
 if($^O =~ /Win32/)
 {
-    eval '
-	package XAMP;
 
-        use Win32::GuiText qw(FindWindowLike GetWindowText);
+    $code = <<'END';
+    package XAMP;
+
+    use Win32::GuiTest qw(FindWindowLike GetWindowText);
 
         sub get_text
-        {
-            my ($win) = FindWindowLike(0, "", "Winamp v1.x");
-            ($win) = FindWindowLike(0, "", "STUDIO") unless $win;
+{
+    my ($win) = FindWindowLike(0, "", "Winamp v1.x");
+    ($win) = FindWindowLike(0, "", "STUDIO") unless $win;
 
-            my $song = GetWindowText($win) if $win;
+    my $song = GetWindowText($win) if $win;
             
-            $song = $song x 2 unless($song =~ m/\d*\. (.*)- Winamp/);
-            return $song;
- 	}
-    ';
+    $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;
-
-	my $rem = Xmms::Remote->new;
-	
-	sub get_text
-	{
-		my $text = $rem->get_playlist_title($rem->get_playlist_pos);
-		$commit = 1 if $text ne $last_text;
-		return $text;
-	}
-    ' or die $@;
+    $code = '
+package XAMP;
+use Xmms::Remote;
+
+my $rem = Xmms::Remote->new;
+
+sub get_text
+{
+    my $text = $rem->get_playlist_title($rem->get_playlist_pos);
+    $commit = 1 if $text ne $last_text;
+    return $text;
 }
+1;
+    ';
+}
+
+# $code =~ s/\n|\r//g;
+eval $code or die "$! $@ $^E";
 
 sub get_title
 {
-	my $text = get_text();
-	my ($title) = $text =~ /-\s+(.*)/;
-	return $title || "Nothing";
+    my $text = get_text();
+    my ($title) = $text =~ /-\s+(.*)/;
+    return $title || "Nothing";
 }
 
 sub get_artist
 {
-	my $text = get_text();
-	my ($artist) = $text =~ /(.*?)\s+-/;
-	return $artist || "Nobody";
+    my $text = get_text();
+    my ($artist) = $text =~ /(.*?)\s+-/;
+    return $artist || "Nobody";
 }
 
 sub update
@@ -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);
     
@@ -80,17 +92,13 @@ sub update
 }
 
 register_hook("signed_in", sub {
-	update();
-	
-	hook("tk_getmain")->repeat(5000, sub {
-		update();
-		$commit = 0;
-	});
-	
+    update();
+    
+    hook("tk_getmain")->repeat(5000, sub {
+        update();
+        $commit = 0;
+    });
+    
 });
 
-
-
-
-
-	    
+1;