[mednaffe] 28/99: Add support to filter cdd files from CloneCD images.
Stephen Kitt
skitt at moszumanska.debian.org
Tue Aug 2 21:00:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednaffe.
commit dbe894239f6586fede61b3b466c9be898b9ba0f5
Author: amatcoder at gmail.com <amatcoder at gmail.com@44025b82-9115-564b-7d03-7f3fc60b4744>
Date: Sat Dec 7 08:07:37 2013 +0000
Add support to filter cdd files from CloneCD images.
---
src/list.c | 14 ++++---
src/mednaffe_glade.h | 104 +++++++++++++++++++++++++++------------------------
src/prefs.c | 18 ++-------
3 files changed, 67 insertions(+), 69 deletions(-)
diff --git a/src/list.c b/src/list.c
index ec006af..25c2036 100644
--- a/src/list.c
+++ b/src/list.c
@@ -161,10 +161,12 @@ void scan_files(gchar *romdir, guidata *gui)
g_strconcat(FindFileData.cFileName, G_DIR_SEPARATOR_S, testdir, NULL));
}
else if ((gui->filter == 2) && (g_str_has_suffix(FindFileData.cFileName, ".cue") ||
- g_str_has_suffix(FindFileData.cFileName, ".toc") ||
+ g_str_has_suffix(FindFileData.cFileName, ".toc") ||
+ g_str_has_suffix(FindFileData.cFileName, ".ccd") ||
g_str_has_suffix(FindFileData.cFileName, ".m3u") ||
- g_str_has_suffix(FindFileData.cFileName, ".CUE") ||
+ g_str_has_suffix(FindFileData.cFileName, ".CUE") ||
g_str_has_suffix(FindFileData.cFileName, ".TOC") ||
+ g_str_has_suffix(FindFileData.cFileName, ".CCD") ||
g_str_has_suffix(FindFileData.cFileName, ".M3U")))
{
gui->itemlist = g_slist_prepend(gui->itemlist,
@@ -212,10 +214,12 @@ void scan_files(gchar *romdir, guidata *gui)
g_strconcat(file, G_DIR_SEPARATOR_S, testdir, NULL));
}
else if ((gui->filter == 2) && (g_str_has_suffix(file, ".cue") ||
- g_str_has_suffix(file, ".toc") ||
+ g_str_has_suffix(file, ".toc") ||
+ g_str_has_suffix(file, ".ccd") ||
g_str_has_suffix(file, ".m3u") ||
- g_str_has_suffix(file, ".CUE") ||
+ g_str_has_suffix(file, ".CUE") ||
g_str_has_suffix(file, ".TOC") ||
+ g_str_has_suffix(file, ".CCD") ||
g_str_has_suffix(file, ".M3U")))
{
gui->itemlist = g_slist_prepend(gui->itemlist,
@@ -362,7 +366,7 @@ void on_radiomenucue_activate(GtkMenuItem *menuitem, guidata *gui)
{
gui->filter=2;
fill_list(NULL, gui);
- gtk_tree_view_column_set_title(gui->column, " Games (cue/toc/m3u)");
+ gtk_tree_view_column_set_title(gui->column, " Games (cue/toc/ccd/m3u)");
}
}
diff --git a/src/mednaffe_glade.h b/src/mednaffe_glade.h
index 0d1ad05..f52967c 100644
--- a/src/mednaffe_glade.h
+++ b/src/mednaffe_glade.h
@@ -28,17 +28,44 @@ static const char *mednaffe_glade =
"<interface>\n"
"<requires lib=\"gtk+\" version=\"2.18\"/>\n"
"<!-- interface-naming-policy toplevel-contextual -->\n"
-"<object class=\"GtkAdjustment\" id=\"adjsfspeed\">\n"
-"<property name=\"lower\">0.25</property>\n"
-"<property name=\"upper\">1</property>\n"
-"<property name=\"value\">0.75</property>\n"
-"<property name=\"step_increment\">0.01</property>\n"
-"<property name=\"page_increment\">0.10000000000000001</property>\n"
+"<object class=\"GtkAdjustment\" id=\"adjustvolume\">\n"
+"<property name=\"upper\">150</property>\n"
+"<property name=\"value\">100</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">10</property>\n"
"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjsoundperiod\">\n"
-"<property name=\"upper\">100000</property>\n"
+"<object class=\"GtkAdjustment\" id=\"adjxres\">\n"
+"<property name=\"upper\">65536</property>\n"
"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">100</property>\n"
+"<property name=\"page_increment\">160</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjxscale\">\n"
+"<property name=\"lower\">0.01</property>\n"
+"<property name=\"upper\">256</property>\n"
+"<property name=\"value\">0.01</property>\n"
+"<property name=\"step_increment\">0.01</property>\n"
+"<property name=\"page_increment\">1</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjxscalefs\">\n"
+"<property name=\"lower\">0.01</property>\n"
+"<property name=\"upper\">256</property>\n"
+"<property name=\"value\">1</property>\n"
+"<property name=\"step_increment\">0.01</property>\n"
+"<property name=\"page_increment\">1</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjyscale\">\n"
+"<property name=\"lower\">0.01</property>\n"
+"<property name=\"upper\">256</property>\n"
+"<property name=\"value\">0.0099999997764825821</property>\n"
+"<property name=\"step_increment\">0.01</property>\n"
+"<property name=\"page_increment\">1</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjyscalefs\">\n"
+"<property name=\"lower\">0.01</property>\n"
+"<property name=\"upper\">256</property>\n"
+"<property name=\"value\">1</property>\n"
+"<property name=\"step_increment\">0.01</property>\n"
+"<property name=\"page_increment\">1</property>\n"
"</object>\n"
"<object class=\"GtkImage\" id=\"add_image\">\n"
"<property name=\"visible\">True</property>\n"
@@ -159,6 +186,18 @@ static const char *mednaffe_glade =
"<property name=\"step_increment\">1</property>\n"
"<property name=\"page_increment\">100</property>\n"
"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjsfspeed\">\n"
+"<property name=\"lower\">0.25</property>\n"
+"<property name=\"upper\">1</property>\n"
+"<property name=\"value\">0.75</property>\n"
+"<property name=\"step_increment\">0.01</property>\n"
+"<property name=\"page_increment\">0.10000000000000001</property>\n"
+"</object>\n"
+"<object class=\"GtkAdjustment\" id=\"adjsoundperiod\">\n"
+"<property name=\"upper\">100000</property>\n"
+"<property name=\"step_increment\">1</property>\n"
+"<property name=\"page_increment\">100</property>\n"
+"</object>\n"
"<object class=\"GtkAdjustment\" id=\"adjsrwframes\">\n"
"<property name=\"lower\">10</property>\n"
"<property name=\"upper\">99999</property>\n"
@@ -186,45 +225,6 @@ static const char *mednaffe_glade =
"<property name=\"step_increment\">1</property>\n"
"<property name=\"page_increment\">10</property>\n"
"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjustvolume\">\n"
-"<property name=\"upper\">150</property>\n"
-"<property name=\"value\">100</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">10</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjxres\">\n"
-"<property name=\"upper\">65536</property>\n"
-"<property name=\"step_increment\">1</property>\n"
-"<property name=\"page_increment\">160</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjxscale\">\n"
-"<property name=\"lower\">0.01</property>\n"
-"<property name=\"upper\">256</property>\n"
-"<property name=\"value\">0.01</property>\n"
-"<property name=\"step_increment\">0.01</property>\n"
-"<property name=\"page_increment\">1</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjxscalefs\">\n"
-"<property name=\"lower\">0.01</property>\n"
-"<property name=\"upper\">256</property>\n"
-"<property name=\"value\">1</property>\n"
-"<property name=\"step_increment\">0.01</property>\n"
-"<property name=\"page_increment\">1</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjyscale\">\n"
-"<property name=\"lower\">0.01</property>\n"
-"<property name=\"upper\">256</property>\n"
-"<property name=\"value\">0.0099999997764825821</property>\n"
-"<property name=\"step_increment\">0.01</property>\n"
-"<property name=\"page_increment\">1</property>\n"
-"</object>\n"
-"<object class=\"GtkAdjustment\" id=\"adjyscalefs\">\n"
-"<property name=\"lower\">0.01</property>\n"
-"<property name=\"upper\">256</property>\n"
-"<property name=\"value\">1</property>\n"
-"<property name=\"step_increment\">0.01</property>\n"
-"<property name=\"page_increment\">1</property>\n"
-"</object>\n"
"<object class=\"GtkAdjustment\" id=\"adyres\">\n"
"<property name=\"upper\">65536</property>\n"
"<property name=\"step_increment\">1</property>\n"
@@ -837,7 +837,7 @@ static const char *mednaffe_glade =
"<object class=\"GtkRadioMenuItem\" id=\"radiomenucue\">\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
-"<property name=\"label\" translatable=\"yes\">Only Cue/Toc/M3u</property>\n"
+"<property name=\"label\" translatable=\"yes\">Only cue/toc/ccd/m3u</property>\n"
"<property name=\"use_underline\">True</property>\n"
"<property name=\"draw_as_radio\">True</property>\n"
"<property name=\"group\">radiomenuzip</property>\n"
@@ -3912,6 +3912,9 @@ static const char *mednaffe_glade =
"<child>\n"
"<placeholder/>\n"
"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
@@ -4067,6 +4070,9 @@ static const char *mednaffe_glade =
"<child>\n"
"<placeholder/>\n"
"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
diff --git a/src/prefs.c b/src/prefs.c
index 5dbd49c..ea1b1be 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -310,30 +310,18 @@ void load_prefs(guidata *gui)
if (width && height)
gtk_window_resize(GTK_WINDOW(gui->topwindow), width, height);
}
-
- option = GTK_WIDGET(gtk_builder_get_object(gui->settings,
- "recursivemenuitem"));
- value = g_key_file_get_integer(key_file, "GUI", "Recursive", &err);
-
- if (err==NULL)
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(option),value);
- else
- {
- g_error_free (err);
- err=NULL;
- }
state=g_key_file_get_integer(key_file, "GUI", "Filter", NULL);
switch (state)
{
case 1:
- option = GTK_WIDGET(gtk_builder_get_object(gui->settings, "radiomenuzip"));
+ option = GTK_WIDGET(gtk_builder_get_object(gui->builder, "radiomenuzip"));
gtk_menu_item_activate (GTK_MENU_ITEM(option));
break;
case 2:
- option = GTK_WIDGET(gtk_builder_get_object(gui->settings, "radiomenucue"));
+ option = GTK_WIDGET(gtk_builder_get_object(gui->builder, "radiomenucue"));
gtk_menu_item_activate (GTK_MENU_ITEM(option));
break;
@@ -364,7 +352,7 @@ void load_prefs(guidata *gui)
switch (state)
{
case 1:
- option = GTK_WIDGET(gtk_builder_get_object(gui->settings, "recursivemenu"));
+ option = GTK_WIDGET(gtk_builder_get_object(gui->builder, "recursivemenu"));
gtk_menu_item_activate (GTK_MENU_ITEM(option));
break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git
More information about the Pkg-games-commits
mailing list