Port control GUI to use the plugin manager

2 files changed, 141 insertions, 127 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 37ea6bf..651c805 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -51,23 +51,23 @@ target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #    set(WITH_CONTROL_GUI TRUE)
 #endif()
 #
-#if (GTK2_FOUND AND WITH_CONTROL_GUI)
-#    include_directories(${GTK2_INCLUDE_DIRS})
-#
-#    add_executable(control 
-#        control.c 
-#        egg-property-cell-renderer.c
-#        egg-property-tree-view.c)
-#
-#    target_link_libraries(control uca
-#        ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
-#
-#    install(TARGETS control
-#        RUNTIME DESTINATION bin)
-#
-#    install(FILES control.glade
-#        DESTINATION share/libuca)
-#endif()
+if (GTK2_FOUND)
+    include_directories(${GTK2_INCLUDE_DIRS})
+
+    add_executable(control 
+        control.c 
+        egg-property-cell-renderer.c
+        egg-property-tree-view.c)
+
+    target_link_libraries(control uca
+        ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
+
+    install(TARGETS control
+        RUNTIME DESTINATION bin)
+
+    install(FILES control.glade
+        DESTINATION share/libuca)
+endif()
 
 #if (HAVE_MOCK_CAMERA)
 #    add_executable(test-mock test-mock.c)
diff --git a/test/control.c b/test/control.c
index eaa88e3..5a7b702 100644
--- a/test/control.c
+++ b/test/control.c
@@ -26,6 +26,7 @@
 
 #include "config.h"
 #include "uca-camera.h"
+#include "uca-plugin-manager.h"
 #include "egg-property-tree-view.h"
 
 
@@ -48,20 +49,17 @@ typedef struct {
     int pixel_size;
 } ThreadData;
 
-typedef struct {
-    ThreadData *thread_data;
-    GtkTreeStore *tree_store;
-} ValueCellData;
-
 enum {
     COLUMN_NAME = 0,
     COLUMN_VALUE,
     COLUMN_EDITABLE,
     NUM_COLUMNS
 };
+    
+static UcaPluginManager *plugin_manager;
 
-
-static void convert_8bit_to_rgb(guchar *output, guchar *input, int width, int height)
+static void
+convert_8bit_to_rgb (guchar *output, guchar *input, int width, int height)
 {
     for (int i = 0, j = 0; i < width*height; i++) {
         output[j++] = input[i];
@@ -70,7 +68,8 @@ static void convert_8bit_to_rgb(guchar *output, guchar *input, int width, int he
     }
 }
 
-static void convert_16bit_to_rgb(guchar *output, guchar *input, int width, int height)
+static void
+convert_16bit_to_rgb (guchar *output, guchar *input, int width, int height)
 {
     guint16 *in = (guint16 *) input;
     guint16 min = G_MAXUINT16, max = 0;
@@ -96,54 +95,58 @@ static void convert_16bit_to_rgb(guchar *output, guchar *input, int width, int h
     }
 }
 
-static void *grab_thread(void *args)
+static void *
+grab_thread (void *args)
 {
     ThreadData *data = (ThreadData *) args;
     gchar filename[FILENAME_MAX] = {0,};
     gint counter = 0;
 
     while (data->running) {
-        uca_camera_grab(data->camera, (gpointer) &data->buffer, NULL);
+        uca_camera_grab (data->camera, (gpointer) &data->buffer, NULL);
 
         if (data->store) {
-            snprintf(filename, FILENAME_MAX, "frame-%i-%08i.raw", data->timestamp, counter++);
-            FILE *fp = fopen(filename, "wb");
-            fwrite(data->buffer, data->width*data->height, data->pixel_size, fp);
-            fclose(fp);
+            snprintf (filename, FILENAME_MAX, "frame-%i-%08i.raw", data->timestamp, counter++);
+            FILE *fp = fopen (filename, "wb");
+            fwrite (data->buffer, data->width*data->height, data->pixel_size, fp);
+            fclose (fp);
         }
 
         /* FIXME: We should actually check if this is really a new frame and
          * just do nothing if it is an already displayed one. */
         if (data->pixel_size == 1)
-            convert_8bit_to_rgb(data->pixels, data->buffer, data->width, data->height);
+            convert_8bit_to_rgb (data->pixels, data->buffer, data->width, data->height);
         else if (data->pixel_size == 2) {
-            convert_16bit_to_rgb(data->pixels, data->buffer, data->width, data->height);
+            convert_16bit_to_rgb (data->pixels, data->buffer, data->width, data->height);
         }
 
-        gdk_threads_enter();
-        gdk_flush();
-        gtk_image_clear(GTK_IMAGE(data->image));
-        gtk_image_set_from_pixbuf(GTK_IMAGE(data->image), data->pixbuf);
-        gtk_widget_queue_draw_area(data->image, 0, 0, data->width, data->height);
-        gdk_threads_leave();
+        gdk_threads_enter ();
+        gdk_flush ();
+        gtk_image_clear (GTK_IMAGE (data->image));
+        gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), data->pixbuf);
+        gtk_widget_queue_draw_area (data->image, 0, 0, data->width, data->height);
+        gdk_threads_leave ();
     }
     return NULL;
 }
 
-gboolean on_delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
+gboolean
+on_delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
     return FALSE;
 }
 
-void on_destroy(GtkWidget *widget, gpointer data)
+void
+on_destroy (GtkWidget *widget, gpointer data)
 {
     ThreadData *td = (ThreadData *) data;
     td->running = FALSE;
-    g_object_unref(td->camera);
-    gtk_main_quit();
+    g_object_unref (td->camera);
+    gtk_main_quit ();
 }
 
-static void on_toolbutton_run_clicked(GtkWidget *widget, gpointer args)
+static void
+on_toolbutton_run_clicked (GtkWidget *widget, gpointer args)
 {
     ThreadData *data = (ThreadData *) args;
 
@@ -153,184 +156,195 @@ static void on_toolbutton_run_clicked(GtkWidget *widget, gpointer args)
     GError *error = NULL;
     data->running = TRUE;
 
-    uca_camera_start_recording(data->camera, &error);
+    uca_camera_start_recording (data->camera, &error);
 
     if (error != NULL) {
-        g_printerr("Failed to start recording: %s\n", error->message);
+        g_printerr ("Failed to start recording: %s\n", error->message);
         return;
     }
 
-    if (!g_thread_create(grab_thread, data, FALSE, &error)) {
-        g_printerr("Failed to create thread: %s\n", error->message);
+    if (!g_thread_create (grab_thread, data, FALSE, &error)) {
+        g_printerr ("Failed to create thread: %s\n", error->message);
         return;
     }
 }
 
-static void on_toolbutton_stop_clicked(GtkWidget *widget, gpointer args)
+static void
+on_toolbutton_stop_clicked (GtkWidget *widget, gpointer args)
 {
     ThreadData *data = (ThreadData *) args;
     data->running = FALSE;
     data->store = FALSE;
     GError *error = NULL;
-    uca_camera_stop_recording(data->camera, &error);
+    uca_camera_stop_recording (data->camera, &error);
 
     if (error != NULL)
-        g_printerr("Failed to stop: %s\n", error->message);
+        g_printerr ("Failed to stop: %s\n", error->message);
 }
 
-static void on_toolbutton_record_clicked(GtkWidget *widget, gpointer args)
+static void
+on_toolbutton_record_clicked (GtkWidget *widget, gpointer args)
 {
     ThreadData *data = (ThreadData *) args;
-    data->timestamp = (int) time(0);
+    data->timestamp = (int) time (0);
     data->store = TRUE;
     GError *error = NULL;
 
-    gtk_statusbar_push(data->statusbar, data->statusbar_context_id, "Recording...");
+    gtk_statusbar_push (data->statusbar, data->statusbar_context_id, "Recording...");
 
     if (data->running != TRUE) {
         data->running = TRUE;
-        uca_camera_start_recording(data->camera, &error);
+        uca_camera_start_recording (data->camera, &error);
 
-        if (!g_thread_create(grab_thread, data, FALSE, &error))
-            g_printerr("Failed to create thread: %s\n", error->message);
+        if (!g_thread_create (grab_thread, data, FALSE, &error))
+            g_printerr ("Failed to create thread: %s\n", error->message);
     }
 }
 
-static void create_main_window(GtkBuilder *builder, const gchar* camera_name)
+static void
+create_main_window (GtkBuilder *builder, const gchar* camera_name)
 {
     static ThreadData td;
 
     GError *error = NULL;
-    UcaCamera *camera = uca_camera_new(camera_name, &error);
+    UcaCamera *camera = uca_plugin_manager_new_camera (plugin_manager, camera_name, &error);
 
     if ((camera == NULL) || (error != NULL)) {
-        g_error("%s\n", error->message);
-        gtk_main_quit();
+        g_error ("%s\n", error->message);
+        gtk_main_quit ();
     }
 
     guint bits_per_sample;
-    g_object_get(camera,
+    g_object_get (camera,
             "roi-width", &td.width,
             "roi-height", &td.height,
             "sensor-bitdepth", &bits_per_sample,
             NULL);
 
-    GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-    GtkWidget *image = GTK_WIDGET(gtk_builder_get_object(builder, "image"));
+    GtkWidget *window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+    GtkWidget *image = GTK_WIDGET (gtk_builder_get_object (builder, "image"));
     GtkWidget *property_tree_view = egg_property_tree_view_new (G_OBJECT (camera));
     GtkContainer *scrolled_property_window = GTK_CONTAINER (gtk_builder_get_object (builder, "scrolledwindow2"));
 
     gtk_container_add (scrolled_property_window, property_tree_view);
     gtk_widget_show_all (GTK_WIDGET (scrolled_property_window));
 
-    GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, td.width, td.height);
-    gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
+    GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, td.width, td.height);
+    gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 
     td.pixel_size = bits_per_sample > 8 ? 2 : 1;
     td.image  = image;
     td.pixbuf = pixbuf;
-    td.buffer = (guchar *) g_malloc(td.pixel_size * td.width * td.height);
-    td.pixels = gdk_pixbuf_get_pixels(pixbuf);
+    td.buffer = (guchar *) g_malloc (td.pixel_size * td.width * td.height);
+    td.pixels = gdk_pixbuf_get_pixels (pixbuf);
     td.running = FALSE;
-    td.statusbar = GTK_STATUSBAR(gtk_builder_get_object(builder, "statusbar"));
-    td.statusbar_context_id = gtk_statusbar_get_context_id(td.statusbar, "Recording Information");
+    td.statusbar = GTK_STATUSBAR (gtk_builder_get_object (builder, "statusbar"));
+    td.statusbar_context_id = gtk_statusbar_get_context_id (td.statusbar, "Recording Information");
     td.store = FALSE;
     td.camera = camera;
-    td.property_model = GTK_TREE_MODEL(gtk_builder_get_object(builder, "camera-properties"));
-
-    g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), &td);
-    g_signal_connect(gtk_builder_get_object(builder, "toolbutton_run"),
-            "clicked", G_CALLBACK(on_toolbutton_run_clicked), &td);
-    g_signal_connect(gtk_builder_get_object(builder, "toolbutton_stop"),
-            "clicked", G_CALLBACK(on_toolbutton_stop_clicked), &td);
-    g_signal_connect(gtk_builder_get_object(builder, "toolbutton_record"),
-            "clicked", G_CALLBACK(on_toolbutton_record_clicked), &td);
-
-    gtk_widget_show(image);
-    gtk_widget_show(window);
+    td.property_model = GTK_TREE_MODEL (gtk_builder_get_object (builder, "camera-properties"));
+
+    g_signal_connect (window, "destroy", G_CALLBACK (on_destroy), &td);
+    g_signal_connect (gtk_builder_get_object (builder, "toolbutton_run"),
+            "clicked", G_CALLBACK (on_toolbutton_run_clicked), &td);
+    g_signal_connect (gtk_builder_get_object (builder, "toolbutton_stop"),
+            "clicked", G_CALLBACK (on_toolbutton_stop_clicked), &td);
+    g_signal_connect (gtk_builder_get_object (builder, "toolbutton_record"),
+            "clicked", G_CALLBACK (on_toolbutton_record_clicked), &td);
+
+    gtk_widget_show (image);
+    gtk_widget_show (window);
 }
 
-static void on_button_proceed_clicked(GtkWidget *widget, gpointer data)
+static void
+on_button_proceed_clicked (GtkWidget *widget, gpointer data)
 {
-    GtkBuilder *builder = GTK_BUILDER(data);
-    GtkWidget *choice_window = GTK_WIDGET(gtk_builder_get_object(builder, "choice-window"));
-    GtkTreeView *treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview-cameras"));
-    GtkListStore *list_store = GTK_LIST_STORE(gtk_builder_get_object(builder, "camera-types"));
+    GtkBuilder *builder = GTK_BUILDER (data);
+    GtkWidget *choice_window = GTK_WIDGET (gtk_builder_get_object (builder, "choice-window"));
+    GtkTreeView *treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "treeview-cameras"));
+    GtkListStore *list_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "camera-types"));
 
-    GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
-    GList *selected_rows = gtk_tree_selection_get_selected_rows(selection, NULL);
+    GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview);
+    GList *selected_rows = gtk_tree_selection_get_selected_rows (selection, NULL);
     GtkTreeIter iter;
 
-    gtk_widget_destroy(choice_window);
-    gboolean valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(list_store), &iter, selected_rows->data);
+    gtk_widget_destroy (choice_window);
+    gboolean valid = gtk_tree_model_get_iter (GTK_TREE_MODEL (list_store), &iter, selected_rows->data);
 
     if (valid) {
         gchar *data;
-        gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, 0, &data, -1);
-        create_main_window(builder, data);
-        g_free(data);
+        gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, 0, &data, -1);
+        create_main_window (builder, data);
+        g_free (data);
     }
 
-    g_list_foreach(selected_rows, (GFunc) gtk_tree_path_free, NULL);
-    g_list_free(selected_rows);
+    g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+    g_list_free (selected_rows);
 }
 
-static void on_treeview_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static void
+on_treeview_keypress (GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
     if (event->keyval == GDK_KEY_Return)
-        gtk_widget_grab_focus(GTK_WIDGET(data));
+        gtk_widget_grab_focus (GTK_WIDGET (data));
 }
 
-static void create_choice_window(GtkBuilder *builder)
+static void
+create_choice_window (GtkBuilder *builder)
 {
-    gchar **camera_types = uca_camera_get_types();
+    GList *camera_types = uca_plugin_manager_get_available_cameras (plugin_manager);
 
-    GtkWidget *choice_window = GTK_WIDGET(gtk_builder_get_object(builder, "choice-window"));
-    GtkTreeView *treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview-cameras"));
-    GtkListStore *list_store = GTK_LIST_STORE(gtk_builder_get_object(builder, "camera-types"));
-    GtkButton *proceed_button = GTK_BUTTON(gtk_builder_get_object(builder, "button-proceed"));
+    GtkWidget *choice_window = GTK_WIDGET (gtk_builder_get_object (builder, "choice-window"));
+    GtkTreeView *treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "treeview-cameras"));
+    GtkListStore *list_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "camera-types"));
+    GtkButton *proceed_button = GTK_BUTTON (gtk_builder_get_object (builder, "button-proceed"));
     GtkTreeIter iter;
 
-    for (guint i = 0; camera_types[i] != NULL; i++) {
-        gtk_list_store_append(list_store, &iter);
-        gtk_list_store_set(list_store, &iter, 0, camera_types[i], -1);
+    for (GList *it = g_list_first (camera_types); it != NULL; it = g_list_next (it)) {
+        gtk_list_store_append (list_store, &iter);
+        gtk_list_store_set (list_store, &iter, 0, g_strdup ((gchar *) it->data), -1);
     }
 
-    gboolean valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter);
+    gboolean valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter);
 
     if (valid) {
-        GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
-        gtk_tree_selection_unselect_all(selection);
-        gtk_tree_selection_select_path(selection, gtk_tree_model_get_path(GTK_TREE_MODEL(list_store), &iter));
+        GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview);
+        gtk_tree_selection_unselect_all (selection);
+        gtk_tree_selection_select_path (selection, gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter));
     }
 
-    g_strfreev(camera_types);
-    g_signal_connect(proceed_button, "clicked", G_CALLBACK(on_button_proceed_clicked), builder);
-    g_signal_connect(treeview, "key-press-event", G_CALLBACK(on_treeview_keypress), proceed_button);
-    gtk_widget_show_all(GTK_WIDGET(choice_window));
+    g_signal_connect (proceed_button, "clicked", G_CALLBACK (on_button_proceed_clicked), builder);
+    g_signal_connect (treeview, "key-press-event", G_CALLBACK (on_treeview_keypress), proceed_button);
+    gtk_widget_show_all (GTK_WIDGET (choice_window));
+
+    g_list_foreach (camera_types, (GFunc) g_free, NULL);
+    g_list_free (camera_types);
 }
 
-int main(int argc, char *argv[])
+int
+main (int argc, char *argv[])
 {
     GError *error = NULL;
 
-    g_thread_init(NULL);
-    gdk_threads_init();
-    gtk_init(&argc, &argv);
+    g_thread_init (NULL);
+    gdk_threads_init ();
+    gtk_init (&argc, &argv);
 
-    GtkBuilder *builder = gtk_builder_new();
+    GtkBuilder *builder = gtk_builder_new ();
 
-    if (!gtk_builder_add_from_file(builder, CONTROL_GLADE_PATH, &error)) {
-        g_print("Error: %s\n", error->message);
+    if (!gtk_builder_add_from_file (builder, CONTROL_GLADE_PATH, &error)) {
+        g_print ("Error: %s\n", error->message);
         return 1;
     }
 
-    create_choice_window(builder);
-    gtk_builder_connect_signals(builder, NULL);
+    plugin_manager = uca_plugin_manager_new ();
+    create_choice_window (builder);
+    gtk_builder_connect_signals (builder, NULL);
 
-    gdk_threads_enter();
-    gtk_main();
-    gdk_threads_leave();
+    gdk_threads_enter ();
+    gtk_main ();
+    gdk_threads_leave ();
 
+    g_object_unref (plugin_manager);
     return 0;
 }