rhythmbox r5650 - in trunk: . plugins/generic-player

[hadess svn gnome org]

Author: hadess
Date: Wed Mar 26 12:35:17 2008
New Revision: 5650
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5650&view=rev

Log:
2008-03-26  Bastien Nocera  <hadess hadess net>

	* plugins/generic-player/rb-generic-player-source.c
	(set_playlist_formats), (debug_device_info),
	(rb_generic_player_source_get_playlist_format):
	Remove the checks for PLA support in totem-pl-parser, we
	depend on a version that's got support



Modified:
   trunk/ChangeLog
   trunk/plugins/generic-player/rb-generic-player-source.c

Modified: trunk/plugins/generic-player/rb-generic-player-source.c
==============================================================================
--- trunk/plugins/generic-player/rb-generic-player-source.c	(original)
+++ trunk/plugins/generic-player/rb-generic-player-source.c	Wed Mar 26 12:35:17 2008
@@ -50,10 +50,6 @@
 #include "rhythmdb-import-job.h"
 #include "rb-import-errors-source.h"
 
-#if TOTEM_PL_PARSER_CHECK_VERSION(2,19,6)
-#define HAVE_TOTEM_PL_PARSER_IRIVER_PLA
-#endif
-
 static GObject *impl_constructor (GType type,
 				  guint n_construct_properties,
 				  GObjectConstructParam *construct_properties);
@@ -324,11 +320,9 @@
 		} else if (strcmp (stripped, "audio/x-scpls") == 0) {
 			priv->playlist_format_unknown = FALSE;
 			priv->playlist_format_pls = TRUE;
-#if defined(HAVE_TOTEM_PL_PARSER_IRIVER_PLA)
 		} else if (strcmp (stripped, "audio/x-iriver-pla") == 0) {
 			priv->playlist_format_unknown = FALSE;
 			priv->playlist_format_iriver_pla = TRUE;
-#endif
 		} else {
 			rb_debug ("unrecognized playlist format: %s", stripped);
 		}
@@ -375,10 +369,8 @@
 			rb_debug ("M3U playlist format is supported");
 		if (priv->playlist_format_pls)
 			rb_debug ("PLS playlist format is supported");
-#if defined(HAVE_TOTEM_PL_PARSER_IRIVER_PLA)
 		if (priv->playlist_format_iriver_pla)
 			rb_debug ("iRiver PLA playlist format is supported");
-#endif
 	}
 
 	if (priv->playlist_path != NULL) {
@@ -1197,11 +1189,9 @@
 		return TOTEM_PL_PARSER_M3U;
 	}
 
-#if defined(HAVE_TOTEM_PL_PARSER_IRIVER_PLA)
 	if (priv->playlist_format_iriver_pla) {
 		return TOTEM_PL_PARSER_IRIVER_PLA;
 	}
-#endif
 
 	/* now what? */
 	return TOTEM_PL_PARSER_PLS;