moved quickopen-related functions into separate C file

4 files changed, 239 insertions, 199 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 8915af2..f7cef88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
 AM_CFLAGS = -Wall
 
 bin_PROGRAMS = experiment-player
-experiment_player_SOURCES = main.c
+experiment_player_SOURCES = main.c quickopen.c \
+			    experiment-player.h
 
 experiment_player_CFLAGS = $(AM_CFLAGS)
 experiment_player_CPPFLAGS = -DDEFAULT_UI='"@DEFAULT_UI@"' \
diff --git a/src/experiment-player.h b/src/experiment-player.h
new file mode 100644
index 0000000..e8a145f
--- /dev/null
+++ b/src/experiment-player.h
@@ -0,0 +1,29 @@
+#ifndef __EXPERIMENT_PLAYER_H
+#define __EXPERIMENT_PLAYER_H
+
+#include <gtk/gtk.h>
+
+gboolean load_media_file(const gchar *uri);
+
+extern GtkWidget *player_window;
+
+extern GtkWidget *player_widget,
+		 *controls_hbox,
+		 *scale_widget,
+		 *playpause_button,
+		 *volume_button;
+
+extern gchar *current_filename;
+
+void refresh_quickopen_menu(GtkMenu *menu);
+
+extern GtkWidget *quickopen_menu,
+		 *quickopen_menu_empty_item;
+
+extern gchar *quickopen_directory;
+
+#define BUILDER_INIT(BUILDER, VAR) do {					\
+	VAR = GTK_WIDGET(gtk_builder_get_object(BUILDER, #VAR));	\
+} while (0)
+
+#endif
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 9483366..a09ac47 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,47 +2,26 @@
 #include "config.h"
 #endif
 
-#include <assert.h>
-#include <string.h>
-#include <unistd.h>
-
 #ifdef HAVE_X11_XLIB_H
 #include <X11/Xlib.h>
 #endif
 
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib/gstdio.h>
-
 #include <gtk/gtk.h>
 #include <gtk-vlc-player.h>
 
-static inline gboolean quickopen_filter(const gchar *name);
-static gint quickopen_item_cmp(gconstpointer a, gconstpointer b);
-static void refresh_quickopen_menu(GtkMenu *menu);
-static void reconfigure_all_check_menu_items_cb(GtkWidget *widget, gpointer user_data);
-static void quickopen_item_on_activate(GtkWidget *widget, gpointer user_data);
+#include "experiment-player.h"
 
 static inline void button_image_set_from_stock(GtkButton *widget, const gchar *name);
-static gboolean load_media_file(const gchar *uri);
-
-#define BUILDER_INIT(BUILDER, VAR) do {					\
-	VAR = GTK_WIDGET(gtk_builder_get_object(BUILDER, #VAR));	\
-} while (0)
 
-static GtkWidget *player_window;
+GtkWidget *player_window;
 
-static GtkWidget *player_widget,
-		 *controls_hbox,
-		 *scale_widget,
-		 *playpause_button,
-		 *volume_button;
+GtkWidget *player_widget,
+	  *controls_hbox,
+	  *scale_widget,
+	  *playpause_button,
+	  *volume_button;
 
-static GtkWidget *quickopen_menu,
-		 *quickopen_menu_empty_item;
-
-static gchar *current_filename = NULL;
-static gchar *quickopen_directory;
+gchar *current_filename = NULL;
 
 /*
  * GtkBuilder signal callbacks
@@ -101,38 +80,6 @@ file_menu_opentranscript_item_activate_cb(GtkWidget *widget, gpointer data)
 }
 
 void
-quickopen_menu_choosedir_item_activate_cb(GtkWidget *widget,
-					  gpointer data __attribute__((unused)))
-{
-	GtkWidget *dialog;
-
-	dialog = gtk_file_chooser_dialog_new("Choose Directory...", GTK_WINDOW(widget),
-					     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					     GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-					     NULL);
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
-					    quickopen_directory);
-
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-		g_free(quickopen_directory);
-		quickopen_directory =
-			gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-
-		refresh_quickopen_menu(GTK_MENU(quickopen_menu));
-	}
-
-	gtk_widget_destroy(dialog);
-}
-
-void
-quickopen_menu_refresh_item_activate_cb(GtkWidget *widget,
-					gpointer data __attribute__((unused)))
-{
-	refresh_quickopen_menu(GTK_MENU(widget));
-}
-
-void
 help_menu_manual_item_activate_cb(GtkWidget *widget __attribute__((unused)),
 				  gpointer data __attribute__((unused)))
 {
@@ -146,142 +93,6 @@ generic_quit_cb(GtkWidget *widget __attribute__((unused)),
 	gtk_main_quit();
 }
 
-static inline gboolean
-quickopen_filter(const gchar *name)
-{
-	gchar *name_reversed = g_strreverse(g_strdup(name));
-	gchar **filters, **filter;
-
-	gchar *trans_name, *p;
-	gboolean res;
-
-	filters = g_strsplit(EXPERIMENT_MOVIE_FILTER, ";", 0);
-	for (filter = filters; *filter != NULL; filter++) {
-		GPatternSpec *pattern = g_pattern_spec_new(*filter);
-
-		res = g_pattern_match(pattern, strlen(name), name, name_reversed);
-		g_pattern_spec_free(pattern);
-		if (res)
-			break;
-	}
-	res = *filter == NULL;
-	g_strfreev(filters);
-	g_free(name_reversed);
-	if (res)
-		return FALSE;
-
-	trans_name = g_strconcat(quickopen_directory, "/", name,
-				 EXPERIMENT_TRANSCRIPT_EXT, NULL);
-	if ((p = g_strrstr(trans_name, ".")) == NULL) {
-		g_free(trans_name);
-		return FALSE;
-	}
-	g_stpcpy(++p, EXPERIMENT_TRANSCRIPT_EXT);
-
-	res = !g_access(trans_name, F_OK | R_OK);
-	g_free(trans_name);
-
-	return res;
-}
-
-static gint
-quickopen_item_cmp(gconstpointer a, gconstpointer b)
-{
-	return -g_strcmp0(gtk_menu_item_get_label(*(GtkMenuItem **)a),
-			  gtk_menu_item_get_label(*(GtkMenuItem **)b));
-}
-
-static void
-refresh_quickopen_menu(GtkMenu *menu)
-{
-	static gchar		**fullnames = NULL;
-	static GPtrArray	*items = NULL;
-
-	int fullnames_n;
-
-	GDir *dir;
-	const gchar *name;
-
-	if (items != NULL)
-		g_ptr_array_free(items, TRUE);
-	items = g_ptr_array_new_with_free_func((GDestroyNotify)gtk_widget_destroy);
-
-	g_strfreev(fullnames);
-	fullnames = NULL;
-	fullnames_n = 0;
-
-	dir = g_dir_open(quickopen_directory, 0, NULL);
-
-	while ((name = g_dir_read_name(dir)) != NULL) {
-		if (!quickopen_filter(name))
-			continue;
-
-		gchar *item_name, *p;
-		GtkWidget *item;
-
-		fullnames = g_realloc(fullnames, (fullnames_n+2) * sizeof(gchar *));
-		fullnames[fullnames_n] = g_strconcat(quickopen_directory, "/",
-						     name, NULL);
-
-		item_name = g_strdup(name);
-		if ((p = g_strrstr(item_name, ".")) != NULL)
-			*p = '\0';
-		item = gtk_check_menu_item_new_with_label(item_name);
-		g_ptr_array_add(items, item);
-		g_free(item_name);
-
-		gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item),
-						      TRUE);
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
-					       !g_strcmp0(current_filename,
-					       	          fullnames[fullnames_n]));
-
-		g_signal_connect(G_OBJECT(item), "activate",
-				 G_CALLBACK(quickopen_item_on_activate),
-				 fullnames[fullnames_n]);
-
-		fullnames_n++;
-	}
-	if (fullnames != NULL)
-		fullnames[fullnames_n] = NULL;
-	g_ptr_array_sort(items, quickopen_item_cmp);
-
-	g_dir_close(dir);
-
-	for (int i = 0; i < items->len; i++) {
-		GtkWidget *item = GTK_WIDGET(g_ptr_array_index(items, i));
-
-		gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item);
-		gtk_widget_show(item);
-	}
-
-	if (fullnames_n > 0)
-		gtk_widget_hide(quickopen_menu_empty_item);
-	else
-		gtk_widget_show(quickopen_menu_empty_item);
-}
-
-static void
-reconfigure_all_check_menu_items_cb(GtkWidget *widget, gpointer user_data)
-{
-	if (GTK_IS_CHECK_MENU_ITEM(widget))
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget),
-					       widget == GTK_WIDGET(user_data));
-}
-
-static void
-quickopen_item_on_activate(GtkWidget *widget, gpointer user_data)
-{
-	const gchar *filename = (const gchar *)user_data;
-
-	gtk_container_foreach(GTK_CONTAINER(quickopen_menu),
-			      reconfigure_all_check_menu_items_cb, widget);
-
-	if (load_media_file(filename)) {
-		/* FIXME */
-	}
-}
-
 static inline void
 button_image_set_from_stock(GtkButton *widget, const gchar *name)
 {
@@ -291,7 +102,7 @@ button_image_set_from_stock(GtkButton *widget, const gchar *name)
 				 GTK_ICON_SIZE_SMALL_TOOLBAR);
 }
 
-static gboolean
+gboolean
 load_media_file(const gchar *uri)
 {
 	if (gtk_vlc_player_load(GTK_VLC_PLAYER(player_widget), uri))
diff --git a/src/quickopen.c b/src/quickopen.c
new file mode 100644
index 0000000..df37338
--- /dev/null
+++ b/src/quickopen.c
@@ -0,0 +1,199 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <assert.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib/gstdio.h>
+
+#include <gtk/gtk.h>
+
+#include "experiment-player.h"
+
+static inline gboolean quickopen_filter(const gchar *name);
+static gint quickopen_item_cmp(gconstpointer a, gconstpointer b);
+
+static void reconfigure_all_check_menu_items_cb(GtkWidget *widget, gpointer user_data);
+static void quickopen_item_on_activate(GtkWidget *widget, gpointer user_data);
+
+GtkWidget *quickopen_menu,
+	  *quickopen_menu_empty_item;
+
+gchar *quickopen_directory;
+
+/*
+ * GtkBuilder signal callbacks
+ * NOTE: for some strange reason the parameters are switched
+ */
+
+void
+quickopen_menu_choosedir_item_activate_cb(GtkWidget *widget,
+					  gpointer data __attribute__((unused)))
+{
+	GtkWidget *dialog;
+
+	dialog = gtk_file_chooser_dialog_new("Choose Directory...", GTK_WINDOW(widget),
+					     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					     GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+					     NULL);
+	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
+					    quickopen_directory);
+
+	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
+		g_free(quickopen_directory);
+		quickopen_directory =
+			gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+
+		refresh_quickopen_menu(GTK_MENU(quickopen_menu));
+	}
+
+	gtk_widget_destroy(dialog);
+}
+
+void
+quickopen_menu_refresh_item_activate_cb(GtkWidget *widget,
+					gpointer data __attribute__((unused)))
+{
+	refresh_quickopen_menu(GTK_MENU(widget));
+}
+
+static inline gboolean
+quickopen_filter(const gchar *name)
+{
+	gchar *name_reversed = g_strreverse(g_strdup(name));
+	gchar **filters, **filter;
+
+	gchar *trans_name, *p;
+	gboolean res;
+
+	filters = g_strsplit(EXPERIMENT_MOVIE_FILTER, ";", 0);
+	for (filter = filters; *filter != NULL; filter++) {
+		GPatternSpec *pattern = g_pattern_spec_new(*filter);
+
+		res = g_pattern_match(pattern, strlen(name), name, name_reversed);
+		g_pattern_spec_free(pattern);
+		if (res)
+			break;
+	}
+	res = *filter == NULL;
+	g_strfreev(filters);
+	g_free(name_reversed);
+	if (res)
+		return FALSE;
+
+	trans_name = g_strconcat(quickopen_directory, "/", name,
+				 EXPERIMENT_TRANSCRIPT_EXT, NULL);
+	if ((p = g_strrstr(trans_name, ".")) == NULL) {
+		g_free(trans_name);
+		return FALSE;
+	}
+	g_stpcpy(++p, EXPERIMENT_TRANSCRIPT_EXT);
+
+	res = !g_access(trans_name, F_OK | R_OK);
+	g_free(trans_name);
+
+	return res;
+}
+
+static gint
+quickopen_item_cmp(gconstpointer a, gconstpointer b)
+{
+	return -g_strcmp0(gtk_menu_item_get_label(*(GtkMenuItem **)a),
+			  gtk_menu_item_get_label(*(GtkMenuItem **)b));
+}
+
+void
+refresh_quickopen_menu(GtkMenu *menu)
+{
+	static gchar		**fullnames = NULL;
+	static GPtrArray	*items = NULL;
+
+	int fullnames_n;
+
+	GDir *dir;
+	const gchar *name;
+
+	if (items != NULL)
+		g_ptr_array_free(items, TRUE);
+	items = g_ptr_array_new_with_free_func((GDestroyNotify)gtk_widget_destroy);
+
+	g_strfreev(fullnames);
+	fullnames = NULL;
+	fullnames_n = 0;
+
+	dir = g_dir_open(quickopen_directory, 0, NULL);
+
+	while ((name = g_dir_read_name(dir)) != NULL) {
+		if (!quickopen_filter(name))
+			continue;
+
+		gchar *item_name, *p;
+		GtkWidget *item;
+
+		fullnames = g_realloc(fullnames, (fullnames_n+2) * sizeof(gchar *));
+		fullnames[fullnames_n] = g_strconcat(quickopen_directory, "/",
+						     name, NULL);
+
+		item_name = g_strdup(name);
+		if ((p = g_strrstr(item_name, ".")) != NULL)
+			*p = '\0';
+		item = gtk_check_menu_item_new_with_label(item_name);
+		g_ptr_array_add(items, item);
+		g_free(item_name);
+
+		gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item),
+						      TRUE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item),
+					       !g_strcmp0(current_filename,
+					       	          fullnames[fullnames_n]));
+
+		g_signal_connect(G_OBJECT(item), "activate",
+				 G_CALLBACK(quickopen_item_on_activate),
+				 fullnames[fullnames_n]);
+
+		fullnames_n++;
+	}
+	if (fullnames != NULL)
+		fullnames[fullnames_n] = NULL;
+	g_ptr_array_sort(items, quickopen_item_cmp);
+
+	g_dir_close(dir);
+
+	for (int i = 0; i < items->len; i++) {
+		GtkWidget *item = GTK_WIDGET(g_ptr_array_index(items, i));
+
+		gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), item);
+		gtk_widget_show(item);
+	}
+
+	if (fullnames_n > 0)
+		gtk_widget_hide(quickopen_menu_empty_item);
+	else
+		gtk_widget_show(quickopen_menu_empty_item);
+}
+
+static void
+reconfigure_all_check_menu_items_cb(GtkWidget *widget, gpointer user_data)
+{
+	if (GTK_IS_CHECK_MENU_ITEM(widget))
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget),
+					       widget == GTK_WIDGET(user_data));
+}
+
+static void
+quickopen_item_on_activate(GtkWidget *widget, gpointer user_data)
+{
+	const gchar *filename = (const gchar *)user_data;
+
+	gtk_container_foreach(GTK_CONTAINER(quickopen_menu),
+			      reconfigure_all_check_menu_items_cb, widget);
+
+	if (load_media_file(filename)) {
+		/* FIXME */
+	}
+}