Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/ChangeLog,v
retrieving revision 1.17
diff -r1.17 ChangeLog
0a1,15
> 2003-04-17  Mark Humphreys <marquee@users.sourceforge.net>
> 
> 	* Makefile.am:
> 	* configure.in:
> 	* iradio/Makefile.am:
> 	* lib/Makefile.am:
> 	* lib/view/Makefile.am:
> 	* lib/widgets/Makefile.am:
> 	* library/Makefile.am:
> 	* net-rhythmbox.spec.in:
> 	* shell/Makefile.am:
> 	* views/Makefile.am:
> 
> 	Remove forked monkey-media dependancies, now uses globally installed library
> 	
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
1c1
< SUBDIRS = monkey-media lib views library iradio shell data po help hack-macros
---
> SUBDIRS = lib views library iradio shell data po help hack-macros
Index: configure.in
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/configure.in,v
retrieving revision 1.8
diff -r1.8 configure.in
31a32,35
>                                                                                 
> MONKEYMEDIA_REQUIRED=0.6.1.99
>                                                                                
> AC_SUBST(MONKEYMEDIA_REQUIRED)
40c44,45
< 		  libgnomecanvas-2.0 >= 1.113.0)
---
> 		  libgnomecanvas-2.0 >= 1.113.0 \
> 		  monkey-media >= $MONKEYMEDIA_REQUIRED) 
159,161d163
< monkey-media/Makefile
< monkey-media/stream-info-impl/Makefile
< monkey-media/stream-info-impl/id3-vfs/Makefile
Index: net-rhythmbox.spec.in
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/net-rhythmbox.spec.in,v
retrieving revision 1.2
diff -r1.2 net-rhythmbox.spec.in
11a12
> Requires:       monkey-media >= @MONKEYMEDIA_REQUIRED@
Index: iradio/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/iradio/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
24d23
< 	-I$(top_srcdir)/monkey-media			\
Index: lib/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/lib/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
48d47
< 	-I$(top_srcdir)/monkey-media			\
Index: lib/view/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/lib/view/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
17d16
< 	-I$(top_srcdir)/monkey-media			\
Index: lib/widgets/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/lib/widgets/Makefile.am,v
retrieving revision 1.4
diff -r1.4 Makefile.am
50d49
< 	-I$(top_srcdir)/monkey-media			\
60c59
< librbwidgets_la_LIDADD = $(top_builddir)/lib/view/librbview.la $(top_builddir)/monkey-media/libmonkey-media.la
---
> librbwidgets_la_LIDADD = $(top_builddir)/lib/view/librbview.la
Index: library/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/library/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
26d25
< 	-I$(top_srcdir)/monkey-media			\
34c33
< librblibrary_la_LIBADD = $(top_builddir)/lib/librb.la $(top_builddir)/monkey-media/libmonkey-media.la
---
> librblibrary_la_LIBADD = $(top_builddir)/lib/librb.la
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/shell/Makefile.am,v
retrieving revision 1.2
diff -r1.2 Makefile.am
27d26
< 	$(top_builddir)/monkey-media/libmonkey-media.la	        \
37d35
< 	-I$(top_srcdir)/monkey-media			\
Index: shell/main.c
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/shell/main.c,v
retrieving revision 1.3
diff -r1.3 main.c
117d116
< 	monkey_media_debug_init (debug);
Index: shell/rb-shell-player.c
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/shell/rb-shell-player.c,v
retrieving revision 1.9
diff -r1.9 rb-shell-player.c
698d697
< 		gboolean use_buffering = !strncmp (uri, "http", 4);
708,709c707
< 		monkey_media_player_open (player->priv->mmplayer, uri, use_buffering,
< 					  &error);
---
> 		monkey_media_player_open (player->priv->mmplayer, uri, &error);
Index: shell/rb-shell.c
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/shell/rb-shell.c,v
retrieving revision 1.6
diff -r1.6 rb-shell.c
67c67
< /* #include "rb-audiocd-view.h" */
---
> #include "rb-audiocd-view.h"
845c845
< 	/*        RBView *audiocd_view; */
---
> 	RBView *audiocd_view;
1064,1073c1064,1073
< /*         if (rb_audiocd_is_any_device_available () == TRUE) */
< /*         { */
< /*                 audiocd_view = rb_audiocd_view_new (shell->priv->container); */
< 
< /*                 if (rb_audiocd_is_cd_available (RB_AUDIOCD_VIEW (audiocd_view)) == TRUE) */
< /*                 { */
< /*                         rb_shell_append_view (shell, audiocd_view); */
< /*                         rb_audiocd_refresh_cd (RB_AUDIOCD_VIEW (audiocd_view)); */
< /*                 } */
< /*         } */
---
> 	if (rb_audiocd_is_any_device_available () == TRUE)
>         {
> 		audiocd_view = rb_audiocd_view_new (shell->priv->container);
> 
> 		if (rb_audiocd_is_cd_available (RB_AUDIOCD_VIEW (audiocd_view)) == TRUE)
> 		{
> 			rb_shell_append_view (shell, audiocd_view);
> 			rb_audiocd_refresh_cd (RB_AUDIOCD_VIEW (audiocd_view));
> 		}
> 	}
Index: views/Makefile.am
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/views/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
13,16c13,15
< 	rb-song-info-helpers.h				
< 
< #	rb-audiocd-view.c				\
< #	rb-audiocd-view.h
---
> 	rb-song-info-helpers.h				\
> 	rb-audiocd-view.c				\
> 	rb-audiocd-view.h
23d21
< 	-I$(top_srcdir)/monkey-media 			\
Index: views/rb-audiocd-view.c
===================================================================
RCS file: /cvs/gnome/net-rhythmbox/views/rb-audiocd-view.c,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 rb-audiocd-view.c
83d82
< static MonkeyMediaAudioStream *rb_audiocd_view_get_stream (RBViewPlayer *player);
93,94c92
< static void song_eos_cb (MonkeyMediaStream *stream,
< 	                 RBAudiocdView *view);
---
> static gboolean rb_audiocd_view_handle_eos (RBViewPlayer *player);
97a96
> static GList *rb_audiocd_view_get_active_uris (RBViewPlayer *player);
114,117c113
< static void rb_audiocd_view_cmd_song_info (BonoboUIComponent *component,
<                                            RBAudiocdView *view,
<                                            const char *verbname);
< static void rb_audiocd_view_cmd_eject_cd (BonoboUIComponent *component,
---
> void rb_audiocd_view_cmd_eject_cd (BonoboUIComponent *component,
129d124
< void update_musicbrainz_info_thread (RBAudiocdView *view);
133a129,131
> void rb_audiocd_view_add_node (RBAudiocdView *view,
>                           RBNode *node);
> void update_musicbrainz_info_thread (RBAudiocdView *view);
150c148,149
< 	MonkeyMediaAudioStream *playing_stream;
---
> 	GList *active_uris;
> 	MonkeyMediaPlayer *mmplayer;   /* Maybe? */
165a165
> 	PROP_PLAYER
173d172
< 	BONOBO_UI_VERB ("SongInfo",    (BonoboUIVerbFn) rb_audiocd_view_cmd_song_info),
257a257,264
> 
> 	g_object_class_install_property (object_class,
> 		 PROP_PLAYER,
> 		 g_param_spec_object ("player",
> 				      "Player",
> 				      "MonkeyMedia Player",
> 				      MONKEY_MEDIA_TYPE_PLAYER,
> 				      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
292c299
< 				              rb_file ("rb-node-view-songs.xml"),
---
> 				              rb_file ("rb-node-view-cdaudio.xml"),
329c336
<         printf ("Saving discinfo");
---
>         rb_debug ("Saving discinfo");
370a378,379
> 	RBAudiocdView *view = RB_AUDIOCD_VIEW (object);
> 
372a382,386
> 	case PROP_PLAYER:
> 	{
> 		view->priv->mmplayer = g_value_get_object (value);
> 		break;
> 	}
384a399,400
> 	RBAudiocdView *view = RB_AUDIOCD_VIEW (object);
> 
386a403,405
> 	case PROP_PLAYER:
> 		g_value_set_object (value, view->priv->mmplayer);
> 		break;
419a439
> 	iface->impl_get_active_uris  = rb_audiocd_view_get_active_uris;
433d452
< 	iface->impl_get_stream       = rb_audiocd_view_get_stream;
435a455
> 	iface->impl_handle_eos       = rb_audiocd_view_handle_eos;
520,521c540
< 	if (monkey_media_stream_get_elapsed_time (MONKEY_MEDIA_STREAM (view->priv->playing_stream)) < 3 &&
< 	    rb_audiocd_view_have_previous (player) == TRUE)
---
> 	if (rb_audiocd_view_have_previous (player) == TRUE)
523d541
< 		/* we're in the first 2 seconds of the song, go to previous */
530,534d547
< 	else
< 	{
< 		/* we're further in the song, restart it */
< 		monkey_media_stream_set_elapsed_time (MONKEY_MEDIA_STREAM (view->priv->playing_stream), 0);
< 	}
607,614d619
< static MonkeyMediaAudioStream *
< rb_audiocd_view_get_stream (RBViewPlayer *player)
< {
< 	RBAudiocdView *view = RB_AUDIOCD_VIEW (player);
< 
< 	return view->priv->playing_stream;
< }
< 
650c655
< 		view->priv->playing_stream = NULL;
---
> 		view->priv->active_uris = NULL;
658d662
< 		GError *error = NULL;
667,681c671,672
< 		
< 		view->priv->playing_stream = monkey_media_audio_stream_new (uri, &error);
< 		if (error != NULL)
< 		{
< 			rb_error_dialog (_("Failed to create stream for %s, error was:\n%s"),
< 					 uri, error->message);
< 			g_error_free (error);
< 			return;
< 		}
< 		
< 		g_signal_connect (G_OBJECT (view->priv->playing_stream),
< 				  "end_of_stream",
< 				  G_CALLBACK (song_eos_cb),
< 				  view);
< 		
---
> 				
> 		view->priv->active_uris = g_list_append (NULL, (char*)uri);
710a702
> /*
719,733c711
< 
< static void
< song_eos_cb (MonkeyMediaStream *stream,
< 	     RBAudiocdView *view)
< {
< 	GDK_THREADS_ENTER ();
< 
< 	song_update_statistics (view);
< 	
< 	rb_audiocd_view_next (RB_VIEW_PLAYER (view));
< 
< 	rb_view_player_notify_changed (RB_VIEW_PLAYER (view));
< 
< 	GDK_THREADS_LEAVE ();
< }
---
> */
852,865c830
< static void
< rb_audiocd_view_cmd_song_info (BonoboUIComponent *component,
<                                RBAudiocdView *view,
<                                const char *verbname)
< {
< 	GtkWidget *song_info = NULL;
< 
< 	g_return_if_fail (view->priv->songs != NULL);
< 
< 	song_info = rb_song_info_new (view->priv->songs);
< 	gtk_widget_show_all (song_info);
< }
< 
< static void
---
> void
870c835
<         printf ("Ejecting CD\n");
---
>         rb_debug ("Ejecting CD");
872a838,839
> 
> 	/* Should remove the view and search of CD again */
915a883,884
> 	
> 	rb_debug ("cdaudio: getting musicbrainz info");
937c906
<         printf ("About to exit thread\n");
---
>         rb_debug ("About to exit cdaudio musicbrainz thread\n");
994a964,965
> 	/* Dummy up number of playes */
> 
1097a1069
> 		int plays;
1121c1093
<                 }
---
> 		}
1158c1130
<                 printf ("Reading CD for the first time\n");
---
>                 rb_debug ("Reading CD for the first time\n");
1200a1173,1191
> }
> 
> static gboolean
> rb_audiocd_view_handle_eos (RBViewPlayer *player)
> {
> 	RBAudiocdView *view = RB_AUDIOCD_VIEW (player);
> 	RBNode *node = rb_node_view_get_playing_node (view->priv->songs);
> 	g_assert (node);
>  	rb_node_update_play_statistics (node); 	
> 	rb_audiocd_view_next (player);
> 	return TRUE;
> }
> 
> static GList *
> rb_audiocd_view_get_active_uris (RBViewPlayer *player)
> {
> 	RBAudiocdView *view = RB_AUDIOCD_VIEW (player);
> 
> 	return view->priv->active_uris;
