Only support opening discs through either their mountpoint (data discs,

2005-07-11  Bastien Nocera  <hadess@hadess.net>

	* src/plparse/totem-disc.c: (totem_cd_detect_type_with_url),
	(totem_cd_detect_type):
	* src/plparse/totem-pl-parser.c:
	* src/totem-menu.c: (on_play_disc_activate):
	* src/totem-uri.c: (totem_is_media), (totem_is_block_device):
	* src/totem-uri.h:
	* src/totem.c: (totem_action_load_media_device),
	(totem_action_play_media_device), (totem_action_play_media),
	(totem_action_open_files_list), (totem_action_open_dialog),
	(on_open1_activate), (main):
	* src/totem.h:

	Only support opening discs through either their mountpoint (data
	discs, VCD, DVD), or block device path (all discs)
	cd:, vcd: and dvd: are gone

1 files changed, 1 insertions, 33 deletions

diff --git a/src/totem-menu.c b/src/totem-menu.c
index 6dbad6c9..3c45bb02 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -528,42 +528,10 @@ totem_action_add_recent (Totem *totem, const char *filename)
 static void
 on_play_disc_activate (GtkMenuItem *menu_item, Totem *totem)
 {
-	MediaType type;
-	GError *error = NULL;
 	char *device_path;
 
 	device_path = g_object_get_data (G_OBJECT (menu_item), "device_path");
-
-	type = totem_cd_detect_type (device_path, &error);
-	switch (type) {
-		case MEDIA_TYPE_ERROR:
-			totem_action_error ("Failed to play Audio/Video Disc",
-					    error ? error->message : "Reason unknown",
-					    totem);
-			return;
-		case MEDIA_TYPE_DATA:
-			/* Maybe set default location to the mountpoint of
-			 * this device?... */
-			{
-				GtkWidget *item;
-				char *uri, *s;
-
-				uri = g_object_get_data (G_OBJECT (menu_item), "activation_uri");
-				s = totem_action_open_dialog (totem, uri);
-				g_free (s);
-			}
-			return;
-		case MEDIA_TYPE_DVD:
-		case MEDIA_TYPE_VCD:
-		case MEDIA_TYPE_CDDA:
-			bacon_video_widget_set_media_device
-				(BACON_VIDEO_WIDGET (totem->bvw), device_path);
-			totem_action_play_media (totem, type);
-			break;
-		default:
-			g_assert_not_reached ();
-	}
-
+	totem_action_play_media_device (totem, device_path);
 	g_free (device_path);
 }