GNOME.org
 

[Rhythmbox-devel] [PATCH] Optional Nautilus CD Burner support (--enable-cdburner)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

attached a patch versus rhythmbox--main--0.9--patch-159. It adds a new
configure option (--enable-cdburner) to enable/disable the Nautilus CD
Burner support. Default is enable if libnautilus-burn is found by
pkg-config (like the D-BUS stuffs):
=====
ChangeLog:
  * configure.ac:
    - removed libnautilus-burn check from the general section
    - added Nautilus CD Burner section
    - added Nautilus CD Burner enable/disable output
  * data/ui/Makefile.am:
    - added HAVE_CDBURNER check
    - new rhythmbox-ui.xml target
  * data/ui/rhythmbox-ui.xml:
    - removed in favor of rhythmbox-ui.xml.in
  * data/ui/rhythmbox-ui.xml.in:
    - new file
  * player/Makefile.am:
    - added HAVE_CDBURNER check
  * shell/rb-playlist-manager.c:
    - added HAVE_CDBURNER checks
  * sources/Makefile.am:
    - added HAVE_CDBURNER check
  * sources/rb-playlist-source.c:
    - added HAVE_CDBURNER checks

Signed: Luca Capello <luca pca it> Fri Jan 14 22:00:43 CET 2005
=====

The patch works on my Debian unstable/experimental (I manually compiled
nautilus-cd-burner-2.9.4 ). I tried compiling with and without
nautilus-cd-burner: in both cases there are no problems.

My GPG key is 6D742669, http://keyserver.linux.it or http://luca.pca.it,
key fingerprint 10CD 0397 6DBE 1E36 DEA3  72CC 540A 7B5E 6D74 2669

Please consider for inclusion.

Thx, bye,
Gismo / Luca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Debian - http://enigmail.mozdev.org

iD8DBQFB6DtsVAp7Xm10JmkRAk9CAJ4rkAnkYyFCIJgzsBuBwL4MQvNWrQCeIEPJ
Pu2pkFU2O3aUad9oT+sRG60=
=l/iI
-----END PGP SIGNATURE-----

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

diff -Naur rhythmbox--main--0.9--patch-159.ORG/configure.ac rhythmbox--main--0.9--patch-159/configure.ac
- --- rhythmbox--main--0.9--patch-159.ORG/configure.ac	2005-01-13 20:32:13.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/configure.ac	2005-01-14 20:53:22.000000000 +0100
@@ -61,7 +61,6 @@
 		  libglade-2.0                  \
 		  gnome-vfs-2.0 >= 2.6          \
 		  gnome-vfs-module-2.0          \
- -		  libnautilus-burn >= 2.9.0	\
 		  $USE_HAL)
 
 RHYTHMBOX_CFLAGS="$CFLAGS $RHYTHMBOX_CFLAGS"
@@ -226,6 +225,21 @@
 AM_CONDITIONAL(WITH_XINE_METADATA, test x"$with_metadata" = "xxine")
 AM_CONDITIONAL(WITH_GST_METADATA, test x"$with_metadata" = "xgstreamer")
 
+dnl Nautilus CD Burner support
+AC_ARG_ENABLE(cd-burner,
+        AC_HELP_STRING([--enable-cdburner],
+           [Enable Nautilus CD Burner support in Rhythmbox]))
+if test x"$enable_cdburner" != xno; then
+   PKG_CHECK_MODULES(CDBURNER, libnautilus-burn >= 2.9.0, enable_cdburner=yes,
+               enable_cdburner=no)
+fi
+if test x"$enable_cdburner" = xyes; then
+	RHYTHMBOX_CFLAGS="$RHYTHMBOX_CFLAGS $CDBURNER_CFLAGS"
+	RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS $CDBURNER_LIBS"
+  AC_DEFINE(HAVE_CDBURNER, 1, [Define if Nautilus CD Burner support is enabled])
+fi
+AM_CONDITIONAL(HAVE_CDBURNER,test "x$enable_cdburner" = "xyes")
+
 dnl AC_CHECK_LIB(lirc_client, lirc_init,
 dnl 		[ AC_CHECK_HEADER(lirc/lirc_client.h,
 dnl 			[ RHYTHMBOX_LIBS="$RHYTHMBOX_LIBS -llirc_client"
@@ -539,6 +553,11 @@
 else
 	AC_MSG_NOTICE([   D-BUS control/activation disabled])
 fi
+if test x"$enable_cdburner" = xyes; then
+	AC_MSG_NOTICE([** Nautilus CD Burner support enabled])
+else
+	AC_MSG_NOTICE([   Nautilus CD Burner support disabled])
+fi
 
 dnl if test "x$enable_audiocd" != "xyes"; then
 dnl 	AC_MSG_NOTICE([   Audio CD support is disabled])
diff -Naur rhythmbox--main--0.9--patch-159.ORG/data/ui/Makefile.am rhythmbox--main--0.9--patch-159/data/ui/Makefile.am
- --- rhythmbox--main--0.9--patch-159.ORG/data/ui/Makefile.am	2005-01-13 20:32:07.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/data/ui/Makefile.am	2005-01-14 20:27:59.000000000 +0100
@@ -5,3 +5,15 @@
 
 EXTRA_DIST = rhythmbox-ui.xml
 
+rhythmbox-ui.xml: 
+if HAVE_CDBURNER
+	cp -f rhythmbox-ui.xml.in rhythmbox-ui.xml
+else
+	while IFS=\n read LINE; do \
+		if test ! "`echo $$LINE | grep "MusicPlaylistBurnPlaylistMenu"`"; then \
+			echo "$$LINE" >> rhythmbox-ui.xml; \
+		fi; \
+	done < rhythmbox-ui.xml.in
+endif
+
+CLEANFILES = rhythmbox-ui.xml
\ No newline at end of file
diff -Naur rhythmbox--main--0.9--patch-159.ORG/data/ui/rhythmbox-ui.xml rhythmbox--main--0.9--patch-159/data/ui/rhythmbox-ui.xml
- --- rhythmbox--main--0.9--patch-159.ORG/data/ui/rhythmbox-ui.xml	2005-01-13 20:32:08.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/data/ui/rhythmbox-ui.xml	1970-01-01 01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
- -<ui>
- -  <menubar name="MenuBar">
- -    <menu name="MusicMenu" action="Music">  
- -      <menuitem name="MusicImportFileMenu" action="MusicImportFile"/>
- -      <menuitem name="MusicImportFolderMenu" action="MusicImportFolder"/>
- -      <menuitem name="MusicImportCD" action="MusicImportCD"/>
- -      <separator/>
- -      <menu name="PlaylistMenu" action="Playlist">
- -	<menuitem name="MusicPlaylistNewPlaylistMenu" action="MusicPlaylistNewPlaylist"/>
- -	<menuitem name="MusicPlaylistNewAutomaticPlaylistMenu" action="MusicPlaylistNewAutomaticPlaylist"/>
- -	<menuitem name="MusicPlaylistLoadPlaylistMenu" action="MusicPlaylistLoadPlaylist"/>
- -	<menuitem name="MusicPlaylistSavePlaylistMenu" action="MusicPlaylistSavePlaylist"/>
- -	<menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
- -	<separator name="MusicPlaylistSeparator1"/>
- -	<menuitem name="MusicPlaylistDeletePlaylistMenu" action="MusicPlaylistDeletePlaylist"/>
- -      </menu>
- -      <menuitem name="MusicNewInternetRadioStationMenu" action="MusicNewInternetRadioStation"/>
- -      <separator/>
- -      <menuitem name="MusicPropertiesMenu" action="MusicProperties"/>
- -      <separator/>
- -      <menuitem name="MusicQuit" action="MusicQuit"/>
- -    </menu>
- -
- -    <menu name="EditMenu" action="Edit">
- -      <menuitem name="EditCutMenu" action="EditCut"/>
- -      <menuitem name="EditCopyMenu" action="EditCopy"/>
- -      <menuitem name="EditPasteMenu" action="EditPaste"/>
- -      <separator name="EditSep1"/> 
- -      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
- -      <menuitem name="EditSelectNoneMenu" action="EditSelectNone"/>
- -      <separator name="EditSep2"/> 
- -      <menuitem name="EditDeleteMenu" action="EditDelete"/>
- -      <separator name="EditSep3"/>
- -      <menuitem name="EditPreferencesMenu" action="EditPreferences"/> 
- -    </menu>
- -
- -    <menu name="ViewMenu" action="View">
- -      <menuitem name="ViewSmallDisplayMenu" action="ViewSmallDisplay"/>
- -      <separator name="ViewSep1"/>
- -      <menuitem name="ViewSourceListMenu" action="ViewSourceList"/>
- -      <menuitem name="ViewBrowserMenu" action="ViewBrowser"/>
- -      <menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
- -      <separator name="ViewSep2"/>
- -      <menuitem name="ViewAllMenu" action="ViewAll"/>
- -      <separator name="ViewSep3"/>
- -      <menuitem name="ViewJumpToPlayingMenu" action="ViewJumpToPlaying"/>
- -    </menu>
- -
- -    <menu name="ControlMenu" action="Control">
- -      <menuitem name="ControlPlayMenu" action="ControlPlay"/>
- -      <menuitem name="ControlPauseMenu" action="ControlPause"/>
- -      <menuitem name="ControlStopMenu" action="ControlStop"/>
- -      <separator name="ControlSep1"/>
- -      <menuitem name="ControlPreviousMenu" action="ControlPrevious"/>
- -      <menuitem name="ControlNextMenu" action="ControlNext"/>
- -      <separator name="ControlSep2"/>
- -      <menuitem name="ControlShuffleMenu" action="ControlShuffle"/>
- -      <menuitem name="ControlRepeatMenu" action="ControlRepeat"/>
- -    </menu>
- -
- -    <menu name="HelpMenu" action="Help">
- -      <menuitem name="HelpContentsMenu" action="HelpContents"/>
- -      <menuitem name="HelpAboutMenu" action="HelpAbout"/>
- -    </menu>
- -
- -  </menubar>
- -
- -  <popup name="RhythmboxTrayPopup">
- -      <menuitem name="PlayTray" action="ControlPlay"/>
- -      <menuitem name="PauseTray" action="ControlPause"/>
- -      <separator/>
- -      <menuitem name="PreviousTray" action="ControlPrevious"/>
- -      <menuitem name="NextTray" action="ControlNext"/>
- -      <separator/>
- -      <menuitem name="ShowWindowTray" action="TrayShowWindow"/>
- -  </popup>
- -
- -  <popup name="LibraryViewPopup">
- -    <menuitem name="CopyLibraryPopup" action="EditCopy"/>
- -    <menuitem name="DeleteLibraryPopup" action="EditDelete"/>
- -    <separator/>
- -    <menuitem name="BrowseGenreLibraryPopup" action="LibrarySrcChooseGenre"/>
- -    <menuitem name="BrowseArtistLibraryPopup" action="LibrarySrcChooseArtist"/>
- -    <menuitem name="BrowseAlbumLibraryPopup" action="LibrarySrcChooseAlbum"/>
- -    <separator/>
- -    <menuitem name="PropertiesLibraryPopup" action="MusicProperties"/>
- -  </popup>
- -
- -  <popup name="PlaylistViewPopup">
- -    <menuitem name="CopyPlaylistPopup" action="EditCopy"/>
- -    <menuitem name="CutPlaylistPopup" action="EditCut"/>
- -    <menuitem name="DeletePlaylistPopup" action="EditDelete"/>
- -    <separator/>
- -    <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
- -  </popup>
- -
- -  <popup name="LibrarySourcePopup">
- -    <menuitem name="LibrarySrcPopupAddFile" action="MusicImportFile"/>
- -    <menuitem name="LibrarySrcPopupAddFolder" action="MusicImportFolder"/>
- -    <menuitem name="LibrarySrcPopupAddCD" action="MusicImportCD"/>
- -  </popup>
- -
- -  <popup name="IRadioViewPopup">
- -    <menuitem name="DeleteIRadioPopup" action="EditDelete"/>
- -    <separator/>
- -    <menuitem name="PropertiesIRadioPopup" action="MusicProperties"/>
- -  </popup>
- -
- -  <popup name="PlaylistSourcePopup">
- -    <menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
- -    <menuitem name="DeletePlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
- -  </popup>
- -
- -  <popup name="SmartPlaylistSourcePopup">
- -    <menuitem name="EditSmartPlaylistPopup" action="EditAutomaticPlaylist"/>
- -    <separator/>
- -    <menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
- -    <menuitem name="DeleteSmartPlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
- -  </popup>
- -
- -</ui>
diff -Naur rhythmbox--main--0.9--patch-159.ORG/data/ui/rhythmbox-ui.xml.in rhythmbox--main--0.9--patch-159/data/ui/rhythmbox-ui.xml.in
- --- rhythmbox--main--0.9--patch-159.ORG/data/ui/rhythmbox-ui.xml.in	1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/data/ui/rhythmbox-ui.xml.in	2005-01-13 20:03:00.000000000 +0100
@@ -0,0 +1,121 @@
+<ui>
+  <menubar name="MenuBar">
+    <menu name="MusicMenu" action="Music">  
+      <menuitem name="MusicImportFileMenu" action="MusicImportFile"/>
+      <menuitem name="MusicImportFolderMenu" action="MusicImportFolder"/>
+      <menuitem name="MusicImportCD" action="MusicImportCD"/>
+      <separator/>
+      <menu name="PlaylistMenu" action="Playlist">
+	<menuitem name="MusicPlaylistNewPlaylistMenu" action="MusicPlaylistNewPlaylist"/>
+	<menuitem name="MusicPlaylistNewAutomaticPlaylistMenu" action="MusicPlaylistNewAutomaticPlaylist"/>
+	<menuitem name="MusicPlaylistLoadPlaylistMenu" action="MusicPlaylistLoadPlaylist"/>
+	<menuitem name="MusicPlaylistSavePlaylistMenu" action="MusicPlaylistSavePlaylist"/>
+	<menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
+	<separator name="MusicPlaylistSeparator1"/>
+	<menuitem name="MusicPlaylistDeletePlaylistMenu" action="MusicPlaylistDeletePlaylist"/>
+      </menu>
+      <menuitem name="MusicNewInternetRadioStationMenu" action="MusicNewInternetRadioStation"/>
+      <separator/>
+      <menuitem name="MusicPropertiesMenu" action="MusicProperties"/>
+      <separator/>
+      <menuitem name="MusicQuit" action="MusicQuit"/>
+    </menu>
+
+    <menu name="EditMenu" action="Edit">
+      <menuitem name="EditCutMenu" action="EditCut"/>
+      <menuitem name="EditCopyMenu" action="EditCopy"/>
+      <menuitem name="EditPasteMenu" action="EditPaste"/>
+      <separator name="EditSep1"/> 
+      <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
+      <menuitem name="EditSelectNoneMenu" action="EditSelectNone"/>
+      <separator name="EditSep2"/> 
+      <menuitem name="EditDeleteMenu" action="EditDelete"/>
+      <separator name="EditSep3"/>
+      <menuitem name="EditPreferencesMenu" action="EditPreferences"/> 
+    </menu>
+
+    <menu name="ViewMenu" action="View">
+      <menuitem name="ViewSmallDisplayMenu" action="ViewSmallDisplay"/>
+      <separator name="ViewSep1"/>
+      <menuitem name="ViewSourceListMenu" action="ViewSourceList"/>
+      <menuitem name="ViewBrowserMenu" action="ViewBrowser"/>
+      <menuitem name="ViewStatusbarMenu" action="ViewStatusbar"/>
+      <separator name="ViewSep2"/>
+      <menuitem name="ViewAllMenu" action="ViewAll"/>
+      <separator name="ViewSep3"/>
+      <menuitem name="ViewJumpToPlayingMenu" action="ViewJumpToPlaying"/>
+    </menu>
+
+    <menu name="ControlMenu" action="Control">
+      <menuitem name="ControlPlayMenu" action="ControlPlay"/>
+      <menuitem name="ControlPauseMenu" action="ControlPause"/>
+      <menuitem name="ControlStopMenu" action="ControlStop"/>
+      <separator name="ControlSep1"/>
+      <menuitem name="ControlPreviousMenu" action="ControlPrevious"/>
+      <menuitem name="ControlNextMenu" action="ControlNext"/>
+      <separator name="ControlSep2"/>
+      <menuitem name="ControlShuffleMenu" action="ControlShuffle"/>
+      <menuitem name="ControlRepeatMenu" action="ControlRepeat"/>
+    </menu>
+
+    <menu name="HelpMenu" action="Help">
+      <menuitem name="HelpContentsMenu" action="HelpContents"/>
+      <menuitem name="HelpAboutMenu" action="HelpAbout"/>
+    </menu>
+
+  </menubar>
+
+  <popup name="RhythmboxTrayPopup">
+      <menuitem name="PlayTray" action="ControlPlay"/>
+      <menuitem name="PauseTray" action="ControlPause"/>
+      <separator/>
+      <menuitem name="PreviousTray" action="ControlPrevious"/>
+      <menuitem name="NextTray" action="ControlNext"/>
+      <separator/>
+      <menuitem name="ShowWindowTray" action="TrayShowWindow"/>
+  </popup>
+
+  <popup name="LibraryViewPopup">
+    <menuitem name="CopyLibraryPopup" action="EditCopy"/>
+    <menuitem name="DeleteLibraryPopup" action="EditDelete"/>
+    <separator/>
+    <menuitem name="BrowseGenreLibraryPopup" action="LibrarySrcChooseGenre"/>
+    <menuitem name="BrowseArtistLibraryPopup" action="LibrarySrcChooseArtist"/>
+    <menuitem name="BrowseAlbumLibraryPopup" action="LibrarySrcChooseAlbum"/>
+    <separator/>
+    <menuitem name="PropertiesLibraryPopup" action="MusicProperties"/>
+  </popup>
+
+  <popup name="PlaylistViewPopup">
+    <menuitem name="CopyPlaylistPopup" action="EditCopy"/>
+    <menuitem name="CutPlaylistPopup" action="EditCut"/>
+    <menuitem name="DeletePlaylistPopup" action="EditDelete"/>
+    <separator/>
+    <menuitem name="PropertiesPlaylistPopup" action="MusicProperties"/>
+  </popup>
+
+  <popup name="LibrarySourcePopup">
+    <menuitem name="LibrarySrcPopupAddFile" action="MusicImportFile"/>
+    <menuitem name="LibrarySrcPopupAddFolder" action="MusicImportFolder"/>
+    <menuitem name="LibrarySrcPopupAddCD" action="MusicImportCD"/>
+  </popup>
+
+  <popup name="IRadioViewPopup">
+    <menuitem name="DeleteIRadioPopup" action="EditDelete"/>
+    <separator/>
+    <menuitem name="PropertiesIRadioPopup" action="MusicProperties"/>
+  </popup>
+
+  <popup name="PlaylistSourcePopup">
+    <menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
+    <menuitem name="DeletePlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
+  </popup>
+
+  <popup name="SmartPlaylistSourcePopup">
+    <menuitem name="EditSmartPlaylistPopup" action="EditAutomaticPlaylist"/>
+    <separator/>
+    <menuitem name="MusicPlaylistBurnPlaylistMenu" action="MusicPlaylistBurnPlaylist"/>
+    <menuitem name="DeleteSmartPlaylistPopup" action="MusicPlaylistDeletePlaylist"/>
+  </popup>
+
+</ui>
diff -Naur rhythmbox--main--0.9--patch-159.ORG/player/Makefile.am rhythmbox--main--0.9--patch-159/player/Makefile.am
- --- rhythmbox--main--0.9--patch-159.ORG/player/Makefile.am	2005-01-13 20:32:07.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/player/Makefile.am	2005-01-13 21:38:37.000000000 +0100
@@ -4,14 +4,21 @@
 
 BUILT_SOURCES =
 
- -librbplayer_la_SOURCES =	\
- -	rb-player.h 		\
- -	rb-recorder.h 
+librbplayer_la_SOURCES = rb-player.h
 
 if USE_XINE
- -librbplayer_la_SOURCES += rb-player-xine.c rb-recorder-xine.c
+librbplayer_la_SOURCES += rb-player-xine.c
 else
- -librbplayer_la_SOURCES += rb-player-gst.c rb-recorder-gst.c
+librbplayer_la_SOURCES += rb-player-gst.c
+endif
+
+if HAVE_CDBURNER
+librbplayer_la_SOURCES += rb-recorder.h 
+if USE_XINE
+librbplayer_la_SOURCES += rb-recorder-xine.c
+else
+librbplayer_la_SOURCES += rb-recorder-gst.c
+endif
 endif
 
 librbplayer_la_LIBADD =				\
diff -Naur rhythmbox--main--0.9--patch-159.ORG/shell/rb-playlist-manager.c rhythmbox--main--0.9--patch-159/shell/rb-playlist-manager.c
- --- rhythmbox--main--0.9--patch-159.ORG/shell/rb-playlist-manager.c	2005-01-13 20:32:07.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/shell/rb-playlist-manager.c	2005-01-14 21:46:06.000000000 +0100
@@ -30,7 +30,9 @@
 
 #include "rb-playlist-manager.h"
 #include "rb-playlist-source.h"
+#ifdef HAVE_CDBURNER
 #include "rb-recorder.h"
+#endif
 #include "rb-sourcelist.h"
 #include "rb-query-creator.h"
 #include "totem-pl-parser.h"
@@ -57,8 +59,10 @@
 						   RBPlaylistManager *mgr);
 static void rb_playlist_manager_cmd_save_playlist (GtkAction *action,
 						   RBPlaylistManager *mgr);
+#ifdef HAVE_CDBURNER
 static void rb_playlist_manager_cmd_burn_playlist (GtkAction *action,
 						   RBPlaylistManager *mgr);
+#endif
 static void rb_playlist_manager_cmd_new_playlist (GtkAction *action,
 						  RBPlaylistManager *mgr);
 static void rb_playlist_manager_cmd_new_automatic_playlist (GtkAction *action,
@@ -143,9 +147,11 @@
 	{ "MusicPlaylistSavePlaylist", GTK_STOCK_SAVE_AS, N_("_Save to file..."), NULL,
 	  N_("Save a playlist to a file"),
 	  G_CALLBACK (rb_playlist_manager_cmd_save_playlist) },
+#ifdef HAVE_CDBURNER
 	{ "MusicPlaylistBurnPlaylist", GTK_STOCK_CDROM, N_("_Create Audio CD..."), NULL,
 	  N_("Create an audio CD from playlist"),
 	  G_CALLBACK (rb_playlist_manager_cmd_burn_playlist) },
+#endif
 	{ "MusicPlaylistDeletePlaylist", GTK_STOCK_REMOVE, N_("_Delete"), NULL,
 	  N_("Delete playlist"),
 	  G_CALLBACK (rb_playlist_manager_cmd_delete_playlist) },
@@ -376,21 +382,27 @@
 	case PROP_SOURCE:
 	{
 		gboolean playlist_active;
+#ifdef HAVE_CDBURNER
 		gboolean recorder_active;
+#endif
 		GtkAction *action;
 
 		mgr->priv->selected_source = g_value_get_object (value);
 
 		playlist_active = g_list_find (mgr->priv->playlists,
 					       mgr->priv->selected_source) != NULL;
+#ifdef HAVE_CDBURNER
 		recorder_active = playlist_active && rb_recorder_enabled ();
+#endif
 
 		action = gtk_action_group_get_action (mgr->priv->actiongroup,
 						      "MusicPlaylistSavePlaylist");
 		g_object_set (G_OBJECT (action), "sensitive", playlist_active, NULL);
+#ifdef HAVE_CDBURNER
 		action = gtk_action_group_get_action (mgr->priv->actiongroup,
 						      "MusicPlaylistBurnPlaylist");
 		g_object_set (G_OBJECT (action), "sensitive", recorder_active, NULL);
+#endif
 		action = gtk_action_group_get_action (mgr->priv->actiongroup,
 						      "MusicPlaylistDeletePlaylist");
 		g_object_set (G_OBJECT (action), "sensitive", playlist_active, NULL);
@@ -830,12 +842,14 @@
 				 mgr, 0);
 }
 
+#ifdef HAVE_CDBURNER
 static void
 rb_playlist_manager_cmd_burn_playlist (GtkAction *action,
 				       RBPlaylistManager *mgr)
 {
 	rb_playlist_source_burn_playlist (RB_PLAYLIST_SOURCE (mgr->priv->selected_source));
 }
+#endif
 
 static void
 add_uri_to_playlist (RBPlaylistManager *mgr, RBPlaylistSource *playlist, const char *uri, const char *title)
diff -Naur rhythmbox--main--0.9--patch-159.ORG/sources/Makefile.am rhythmbox--main--0.9--patch-159/sources/Makefile.am
- --- rhythmbox--main--0.9--patch-159.ORG/sources/Makefile.am	2005-01-13 20:32:07.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/sources/Makefile.am	2005-01-13 21:47:09.000000000 +0100
@@ -14,9 +14,13 @@
 	rb-iradio-source.c		\
 	rb-iradio-source.h		\
 	rb-playlist-source.c            \
- -	rb-playlist-source.h		\
+	rb-playlist-source.h
+
+if HAVE_CDBURNER
+libsourcesimpl_la_SOURCES +=		\
 	rb-playlist-source-recorder.c   \
 	rb-playlist-source-recorder.h		
+endif
 
 INCLUDES =						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff -Naur rhythmbox--main--0.9--patch-159.ORG/sources/rb-playlist-source.c rhythmbox--main--0.9--patch-159/sources/rb-playlist-source.c
- --- rhythmbox--main--0.9--patch-159.ORG/sources/rb-playlist-source.c	2005-01-13 20:32:13.000000000 +0100
+++ rhythmbox--main--0.9--patch-159/sources/rb-playlist-source.c	2005-01-14 16:52:31.000000000 +0100
@@ -38,7 +38,9 @@
 #include "rb-dialog.h"
 #include "rb-util.h"
 #include "rb-playlist-source.h"
+#ifdef HAVE_CDBURNER
 #include "rb-playlist-source-recorder.h"
+#endif
 #include "rb-volume.h"
 #include "rb-debug.h"
 #include "eel-gconf-extensions.h"
@@ -753,6 +755,7 @@
 				 "%s", error->message);
 }
 
+#ifdef HAVE_CDBURNER
 static void
 burn_playlist_iter_func (GtkTreeModel *model, GtkTreeIter *iter, char **uri, char **artist, char **title, gulong *duration)
 {
@@ -792,6 +795,7 @@
 
 	gtk_widget_show (recorder);
 }
+#endif
 
 RBSource *
 rb_playlist_source_new_from_xml	(RBShell *shell,
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFB6DpqVAp7Xm10JmkRAru6AJ9ZwVRAtPzcpU9Mo6j7pKB+tpE5dwCdFzZd
4q8UYyRCcn5i6BBoZ60CNR0=
=faOZ
-----END PGP SIGNATURE-----
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]