rpms/muine-scrobbler/devel muine-scrobbler.spec, NONE, 1.1 muinescrobbler-0.1.8-no-generics.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sindre Pedersen Bjørdal (sindrepb) fedora-extras-commits at redhat.com
Wed May 23 10:50:52 UTC 2007


Author: sindrepb

Update of /cvs/extras/rpms/muine-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8428/devel

Modified Files:
	.cvsignore sources 
Added Files:
	muine-scrobbler.spec muinescrobbler-0.1.8-no-generics.diff 
Log Message:
Add muine-scrobbler, maintained by me



--- NEW FILE muine-scrobbler.spec ---
%define real_name muinescrobbler

Name:           muine-scrobbler
Version:        0.1.8
Release:        1%{?dist}
Summary:        Audioscrobbler plugin for Muine

Group:          Applications/Multimedia
License:        GPL
URL:            http://home.gna.org/muinescrobbler/
Source0:        http://download.gna.org/muinescrobbler/%{real_name}-%{version}.tar.gz
Patch0:         %{real_name}-0.1.8-no-generics.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  mono-devel, muine-devel, 
BuildRequires:  gtk-sharp2-devel, gnome-sharp-devel

%description
Muine-scrobbler is a plugin to connect to last.fm/audioscrobbler 
from the Muine music player.

Last.fm (www.last.fm) is a service for tracking your listening habits 
and suggesting new music you might like.

%prep
%setup -qn %{real_name}
%patch0 -p1 

%build
make


%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}/muine/plugins
install -m 0644 $RPM_BUILD_DIR/%{real_name}/*.dll $RPM_BUILD_ROOT%{_libdir}/muine/plugins/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog
%{_libdir}/muine/plugins/*



%changelog
* Thu Mar 08 2007 Sindre Pedersen Bjørdal <foolish[AT]guezz.net> - 0.1.8-1
- initial build

muinescrobbler-0.1.8-no-generics.diff:

--- NEW FILE muinescrobbler-0.1.8-no-generics.diff ---
diff -urb muinescrobbler-0.1.8/AudioscrobblerPlugin.cs muinescrobbler-0.1.8-no-generics/AudioscrobblerPlugin.cs
--- muinescrobbler-0.1.8/AudioscrobblerPlugin.cs	2005-11-20 13:31:39.000000000 -0800
+++ muinescrobbler-0.1.8-no-generics/AudioscrobblerPlugin.cs	2006-07-17 16:23:32.000000000 -0700
@@ -186,9 +186,9 @@
       StatusBar.Push(StatusID, "Ready.");
 
       // catch events from Audioscobbler object
-      scrobbler.AuthErrorEventLazy    += OnAuthErrorEvent;
-      scrobbler.NetworkErrorEventLazy += OnNetworkErrorEvent;
-      scrobbler.SubmitEventLazy       += OnSubmitEvent;
+      scrobbler.AuthErrorEvent        += OnAuthErrorEvent;
+      scrobbler.NetworkErrorEvent     += OnNetworkErrorEvent;
+      scrobbler.SubmitEvent           += OnSubmitEvent;
       scrobbler.ConnectEvent          += OnConnectEvent;
       scrobbler.DisconnectEvent       += OnDisconnectEvent;
 
Only in muinescrobbler-0.1.8: EventQueue.cs
Only in muinescrobbler-0.1.8: Functor.cs
diff -urb muinescrobbler-0.1.8/GAudioscrobbler.cs muinescrobbler-0.1.8-no-generics/GAudioscrobbler.cs
--- muinescrobbler-0.1.8/GAudioscrobbler.cs	2005-11-20 13:31:17.000000000 -0800
+++ muinescrobbler-0.1.8-no-generics/GAudioscrobbler.cs	2006-07-17 16:31:03.000000000 -0700
@@ -142,28 +142,28 @@
   public class GAudioscrobbler
   {
     /// Called whenever a network error occurs.
-    public event Functor<void, NetworkErrorEventArgs> NetworkErrorEvent;
-    public event Functor<void, NetworkErrorEventArgs> NetworkErrorEventLazy;
+    public delegate void NetworkErrorEventHandler(NetworkErrorEventArgs args);
+    public event NetworkErrorEventHandler NetworkErrorEvent;
 
     /// Called whenever an authentication failure happened.
-    public event Functor<void, AuthErrorEventArgs> AuthErrorEvent;
-    public event Functor<void, AuthErrorEventArgs> AuthErrorEventLazy;
+    public delegate void AuthErrorEventHandler(AuthErrorEventArgs args);
+    public event AuthErrorEventHandler AuthErrorEvent;
 
     /// Called whenever the handshake (login) was successful.
-    public event Functor<void, ConnectEventArgs> ConnectEvent;
-    public event Functor<void, ConnectEventArgs> ConnectEventLazy;
+    public delegate void ConnectEventHandler(ConnectEventArgs args);
+    public event ConnectEventHandler ConnectEvent;
 
     /// Called whenever the connection was successfully terminated.
-    public event Functor<void, DisconnectEventArgs> DisconnectEvent;
-    public event Functor<void, DisconnectEventArgs> DisconnectEventLazy;
+    public delegate void DisconnectEventHandler(DisconnectEventArgs args);
+    public event DisconnectEventHandler DisconnectEvent;
     
     /// Called whenever a song was successfully submitted.
-    public event Functor<void, SubmitEventArgs> SubmitEvent;
-    public event Functor<void, SubmitEventArgs> SubmitEventLazy;
+    public delegate void SubmitEventHandler(SubmitEventArgs args);
+    public event SubmitEventHandler SubmitEvent;
     
     /// Called when availibility of a client update was detected.
-    public event Functor<void, UpdateAvailableEventArgs> UpdateAvailableEvent;
-    public event Functor<void, UpdateAvailableEventArgs> UpdateAvailableEventLazy;
+    public delegate void UpdateAvailableEventHandler(UpdateAvailableEventArgs args);
+    public event UpdateAvailableEventHandler UpdateAvailableEvent;
     
     // Constants.
     const int    MAX_QUEUE_SIZE      = 1000;
@@ -185,7 +185,6 @@
     // Other internal properties.
     private ArrayList           queue;
     private Object              queueLock;
-    private EventQueue          eventQueue;
     private Object              submitLock;
     private DateTime            lastHandshake;        //< last successful attempt.
     private TimeSpan            handshakeInterval;
@@ -212,7 +211,6 @@
       connected            = false;
       queue                = new ArrayList();
       queueLock            = new Object();
-      eventQueue           = new EventQueue();
       submitLock           = new Object();
       lastHandshake        = DateTime.MinValue;
       handshakeInterval    = new TimeSpan(0, HANDSHAKE_INTERVAL, 0);
@@ -366,11 +364,6 @@
       Global.Log(0, "GAudioscrobbler.EmitAuthErrorEvent", "Start");
       if (AuthErrorEvent != null)
         AuthErrorEvent(args_);
-      if (AuthErrorEventLazy == null)
-        return;
-      Functor<void> func =
-        EventQueue.BindOne<void, AuthErrorEventArgs>(AuthErrorEventLazy, args_);
-      eventQueue.Queue(func);
       Global.Log(0, "GAudioscrobbler.EmitAuthErrorEvent", "End");
     }
 
@@ -379,12 +372,6 @@
       Global.Log(0, "GAudioscrobbler.EmitNetworkErrorEvent", "Start");
       if (NetworkErrorEvent != null)
         NetworkErrorEvent(args_);
-      if (NetworkErrorEventLazy == null)
-        return;
-      Functor<void> func =
-        EventQueue.BindOne<void, NetworkErrorEventArgs>(NetworkErrorEventLazy,
-                                                        args_);
-      eventQueue.Queue(func);
       Global.Log(0, "GAudioscrobbler.EmitNetworkErrorEvent", "End");
     }
 
@@ -393,11 +380,6 @@
       Global.Log(0, "GAudioscrobbler.EmitSubmitEvent", "Start");
       if (SubmitEvent != null)
         SubmitEvent(args_);
-      if (SubmitEventLazy == null)
-        return;
-      Functor<void> func =
-        EventQueue.BindOne<void, SubmitEventArgs>(SubmitEventLazy, args_);
-      eventQueue.Queue(func);
       Global.Log(0, "GAudioscrobbler.EmitSubmitEvent", "End");
     }
 
@@ -406,11 +388,6 @@
       Global.Log(0, "GAudioscrobbler.EmitUpdateAvailableEvent", "Start");
       if (UpdateAvailableEvent != null)
         UpdateAvailableEvent(args_);
-      if (UpdateAvailableEventLazy == null)
-        return;
-      Functor<void> func =
-        EventQueue.BindOne<void, UpdateAvailableEventArgs>(UpdateAvailableEventLazy, args_);
-      eventQueue.Queue(func);
       Global.Log(0, "GAudioscrobbler.EmitUpdateAvailableEvent", "End");
     }
 
@@ -419,11 +396,6 @@
       Global.Log(0, "GAudioscrobbler.EmitConnectEvent", "Start");
       if (ConnectEvent != null)
         ConnectEvent(args_);
-      if (ConnectEventLazy == null)
-        return;
-      Functor<void> func =
-        EventQueue.BindOne<void, ConnectEventArgs>(ConnectEventLazy, args_);
-      eventQueue.Queue(func);
       Global.Log(0, "GAudioscrobbler.EmitConnectEvent", "End");
     }
 
@@ -432,11 +404,6 @@
       Global.Log(0, "GAudioscrobbler.EmitDisconnectEvent", "Start");
       if (DisconnectEvent != null)
         DisconnectEvent(args_);
-      if (DisconnectEventLazy == null)
-        return;
-      Functor<void> func =
-        EventQueue.BindOne<void, DisconnectEventArgs>(DisconnectEventLazy, args_);
-      eventQueue.Queue(func);
       Global.Log(0, "GAudioscrobbler.EmitDisconnectEvent", "End");
     }
 
diff -urb muinescrobbler-0.1.8/Makefile muinescrobbler-0.1.8-no-generics/Makefile
--- muinescrobbler-0.1.8/Makefile	2005-09-26 10:51:29.000000000 -0700
+++ muinescrobbler-0.1.8-no-generics/Makefile	2006-07-17 15:32:24.000000000 -0700
@@ -1,7 +1,7 @@
-CS_FILES =  EventQueue.cs Functor.cs Global.cs Song.cs GAudioscrobbler.cs AudioscrobblerPlugin.cs
+CS_FILES = Global.cs Song.cs GAudioscrobbler.cs AudioscrobblerPlugin.cs
 
 AudioscrobblerPlugin.dll: $(CS_FILES) Audioscrobbler.glade
-	gmcs -target:library -out:AudioscrobblerPlugin.dll -r:Mono.Security.dll -r:System.Web.dll -pkg:gconf-sharp-2.0 -pkg:glade-sharp-2.0 -pkg:muine-plugin -resource:Audioscrobbler.glade $(CS_FILES)
+	mcs -target:library -out:AudioscrobblerPlugin.dll -r:Mono.Security.dll -r:System.Web.dll -pkg:gconf-sharp-2.0 -pkg:glade-sharp-2.0 -pkg:muine-plugin -resource:Audioscrobbler.glade $(CS_FILES)
 
 install: AudioscrobblerPlugin.dll
 	mkdir -p ~/.gnome2/muine/plugins


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muine-scrobbler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 May 2007 15:24:51 -0000	1.1
+++ .cvsignore	23 May 2007 10:50:15 -0000	1.2
@@ -0,0 +1 @@
+muinescrobbler-0.1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muine-scrobbler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 May 2007 15:24:51 -0000	1.1
+++ sources	23 May 2007 10:50:15 -0000	1.2
@@ -0,0 +1 @@
+c8470e586c5face7f9be09decbe20398  muinescrobbler-0.1.8.tar.gz




More information about the fedora-extras-commits mailing list