Changeset 1881 for lang/c/sonydb

Timestamp:

11/21/07 16:40:52 (14 months ago)

Author:

mattn

Message:

lang/c/sonydb/frontend.cpp,
lang/c/sonydb/Makefile.w32:

added message dialog 'Can't detect devices!'.

Location:

lang/c/sonydb

Files:

• Makefile.w32 (modified) (1 diff)
• frontend.cpp (modified) (2 diffs)

lang/c/sonydb/Makefile.w32

@@ -18 +18 @@
 
 gui : sonydb.obj images.h
-        cl -DID3LIB_LINKOPTION=3 -Iid3lib/include -DGUI $(GTK_CFLAGS) -c -GX frontend.cpp
+        cl -DID3LIB_LINKOPTION=1 -Iid3lib/include -DGUI $(GTK_CFLAGS) -c -GX -MD frontend.cpp
         link /out:sonydb.exe sonydb.obj frontend.obj sonydb.res /libpath:id3lib id3lib.lib zlib.lib $(GTK_LDFLAGS) /nodefaultlib:libcmt
 

lang/c/sonydb/frontend.cpp

@@ -740 +740 @@
         };
         gint n_drag_types = sizeof (drag_types) / sizeof (drag_types [0]);
+        bool detected = false;
         SonyDb sonydb;
 
-        sonydb.detectPlayer();
-
         gtk_init(&argc, &argv);
+
+        detected = sonydb.detectPlayer();
+
         window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
         gtk_window_set_title(GTK_WINDOW(window), "SonyDb");
@@ -832 +834 @@
         gtk_widget_show_all(window);
 
-        rebuild_tree(treeview, &sonydb, true);
+        if (detected) {
+                rebuild_tree(treeview, &sonydb, true);
+        } else {
+                GtkWidget* error;
+                error  = gtk_message_dialog_new(
+                        GTK_WINDOW(window),
+                        (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
+                        GTK_MESSAGE_ERROR,
+                        GTK_BUTTONS_OK,
+                        "Can't detect devices!");
+                gtk_window_set_title(GTK_WINDOW(error), gtk_window_get_title(GTK_WINDOW(window)));
+                gint response = gtk_dialog_run(GTK_DIALOG(error));
+                gtk_widget_destroy(error);
+                return;
+        }
 
         gtk_main();