diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/gtkui/callbacks.c | 22 | ||||
-rw-r--r-- | plugins/gtkui/callbacks.h | 4 | ||||
-rw-r--r-- | plugins/gtkui/deadbeef.glade | 36 | ||||
-rw-r--r-- | plugins/gtkui/gtkui.c | 13 | ||||
-rw-r--r-- | plugins/gtkui/gtkui.h | 3 | ||||
-rw-r--r-- | plugins/gtkui/interface.c | 103 | ||||
-rw-r--r-- | plugins/gtkui/plcommon.c | 5 |
7 files changed, 118 insertions, 68 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index a152aef5..c13ee248 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -302,17 +302,6 @@ on_playrand_clicked (GtkButton *button, deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0); } -void -focus_on_playing_track (void) { - DB_playItem_t *it = deadbeef->streamer_get_playing_track (); - if (it) { - int idx = deadbeef->pl_get_idx_of (it); - ddb_listview_scroll_to (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), idx); - ddb_listview_set_cursor (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), idx); - deadbeef->pl_item_unref (it); - } -} - gboolean on_mainwin_key_press_event (GtkWidget *widget, GdkEventKey *event, @@ -330,9 +319,6 @@ on_mainwin_key_press_event (GtkWidget *widget, deadbeef->conf_set_int ("playlist.current", pl); } } - else if (event->state == GDK_CONTROL_MASK && event->keyval == GDK_j) { - focus_on_playing_track (); - } else { ddb_listview_handle_keypress (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), event->keyval, event->state); } @@ -1071,3 +1057,11 @@ create_seekbar (gchar *widget_name, gchar *string1, gchar *string2, return GTK_WIDGET (ddb_seekbar_new ()); } + +void +on_jump_to_current_track1_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + gtkui_focus_on_playing_track (); +} + diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index 62d79f38..0a54f314 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -975,3 +975,7 @@ on_statusbar_button_press_event (GtkWidget *widget, void on_resume_last_session_toggled (GtkToggleButton *togglebutton, gpointer user_data); + +void +on_jump_to_current_track1_activate (GtkMenuItem *menuitem, + gpointer user_data); diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index c2dd31f0..61f3300c 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -62,7 +62,7 @@ <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image423"> + <widget class="GtkImage" id="image430"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -89,7 +89,7 @@ <signal name="activate" handler="on_add_files_activate" last_modification_time="Sat, 04 Jul 2009 13:04:01 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image424"> + <widget class="GtkImage" id="image431"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -110,7 +110,7 @@ <signal name="activate" handler="on_add_folders_activate" last_modification_time="Sun, 06 Sep 2009 17:51:40 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image425"> + <widget class="GtkImage" id="image432"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -190,7 +190,7 @@ <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/> <child internal-child="image"> - <widget class="GtkImage" id="image426"> + <widget class="GtkImage" id="image433"> <property name="visible">True</property> <property name="stock">gtk-quit</property> <property name="icon_size">1</property> @@ -224,7 +224,7 @@ <signal name="activate" handler="on_clear1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image427"> + <widget class="GtkImage" id="image434"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> @@ -283,7 +283,7 @@ <signal name="activate" handler="on_remove1_activate" last_modification_time="Sun, 06 Sep 2009 18:30:03 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image428"> + <widget class="GtkImage" id="image435"> <property name="visible">True</property> <property name="stock">gtk-remove</property> <property name="icon_size">1</property> @@ -520,6 +520,22 @@ <accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/> </widget> </child> + + <child> + <widget class="GtkSeparatorMenuItem" id="separator11"> + <property name="visible">True</property> + </widget> + </child> + + <child> + <widget class="GtkMenuItem" id="jump_to_current_track1"> + <property name="visible">True</property> + <property name="label" translatable="yes">Jump to current track</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_jump_to_current_track1_activate" last_modification_time="Wed, 01 Sep 2010 19:11:01 GMT"/> + <accelerator key="J" modifiers="GDK_CONTROL_MASK" signal="activate"/> + </widget> + </child> </widget> </child> </widget> @@ -542,7 +558,7 @@ <signal name="activate" handler="on_help1_activate" last_modification_time="Tue, 08 Sep 2009 17:32:06 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image429"> + <widget class="GtkImage" id="image436"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> @@ -573,7 +589,7 @@ <child> <widget class="GtkMenuItem" id="gpl1"> <property name="visible">True</property> - <property name="label">_GPLv2</property> + <property name="label" translatable="yes">_GPLv2</property> <property name="use_underline">True</property> <signal name="activate" handler="on_gpl1_activate" last_modification_time="Wed, 06 Jan 2010 20:30:20 GMT"/> </widget> @@ -582,7 +598,7 @@ <child> <widget class="GtkMenuItem" id="lgpl1"> <property name="visible">True</property> - <property name="label">_LGPLv2.1</property> + <property name="label" translatable="yes">_LGPLv2.1</property> <property name="use_underline">True</property> <signal name="activate" handler="on_lgpl1_activate" last_modification_time="Wed, 06 Jan 2010 20:30:20 GMT"/> </widget> @@ -602,7 +618,7 @@ <signal name="activate" handler="on_about1_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image430"> + <widget class="GtkImage" id="image437"> <property name="visible">True</property> <property name="stock">gtk-about</property> <property name="icon_size">1</property> diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index 9c7eb63b..f740bacb 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -992,7 +992,9 @@ gtkui_thread (void *ctx) { deadbeef->pl_format_title (NULL, -1, str, sizeof (str), -1, deadbeef->conf_get_str ("gtkui.titlebar_stopped", "DeaDBeeF-%V")); gtk_window_set_title (GTK_WINDOW (mainwin), str); gtk_initialized = 1; + gtk_main (); + cover_art_free (); eq_window_destroy (); trkproperties_destroy (); @@ -1062,6 +1064,17 @@ gtkui_pl_add_files_end (void) { gtkui_original_pl_add_files_end (); } +void +gtkui_focus_on_playing_track (void) { + DB_playItem_t *it = deadbeef->streamer_get_playing_track (); + if (it) { + int idx = deadbeef->pl_get_idx_of (it); + ddb_listview_scroll_to (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), idx); + ddb_listview_set_cursor (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), idx); + deadbeef->pl_item_unref (it); + } +} + static int gtkui_start (void) { // gtk must be running in separate thread diff --git a/plugins/gtkui/gtkui.h b/plugins/gtkui/gtkui.h index 5ab30376..c333b322 100644 --- a/plugins/gtkui/gtkui.h +++ b/plugins/gtkui/gtkui.h @@ -154,4 +154,7 @@ gtkui_add_file_info_cb (DB_playItem_t *it, void *data); extern int (*gtkui_original_pl_add_dir) (const char *dirname, int (*cb)(DB_playItem_t *it, void *data), void *user_data); extern int (*gtkui_original_pl_add_file) (const char *fname, int (*cb)(DB_playItem_t *it, void *data), void *user_data); +void +gtkui_focus_on_playing_track (void); + #endif diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index e6f59396..d06900e3 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -35,12 +35,12 @@ create_mainwin (void) GtkWidget *File; GtkWidget *File_menu; GtkWidget *open; - GtkWidget *image423; + GtkWidget *image430; GtkWidget *separator2; GtkWidget *add_files; - GtkWidget *image424; + GtkWidget *image431; GtkWidget *add_folders; - GtkWidget *image425; + GtkWidget *image432; GtkWidget *add_location1; GtkWidget *separatormenuitem1; GtkWidget *new_playlist1; @@ -49,18 +49,18 @@ create_mainwin (void) GtkWidget *playlist_save_as; GtkWidget *separator8; GtkWidget *quit; - GtkWidget *image426; + GtkWidget *image433; GtkWidget *Edit; GtkWidget *Edit_menu; GtkWidget *clear1; - GtkWidget *image427; + GtkWidget *image434; GtkWidget *select_all1; GtkWidget *deselect_all1; GtkWidget *invert_selection1; GtkWidget *Selection; GtkWidget *Selection_menu; GtkWidget *remove1; - GtkWidget *image428; + GtkWidget *image435; GtkWidget *crop1; GtkWidget *find1; GtkWidget *separator5; @@ -88,17 +88,19 @@ create_mainwin (void) GtkWidget *scroll_follows_playback; GtkWidget *cursor_follows_playback; GtkWidget *stop_after_current; + GtkWidget *separator11; + GtkWidget *jump_to_current_track1; GtkWidget *Help; GtkWidget *Help_menu; GtkWidget *help1; - GtkWidget *image429; + GtkWidget *image436; GtkWidget *changelog1; GtkWidget *separator10; GtkWidget *gpl1; GtkWidget *lgpl1; GtkWidget *separator9; GtkWidget *about1; - GtkWidget *image430; + GtkWidget *image437; GtkWidget *hbox2; GtkWidget *hbox3; GtkWidget *stopbtn; @@ -149,9 +151,9 @@ create_mainwin (void) GDK_O, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image423 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image423); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image423); + image430 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image430); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image430); separator2 = gtk_separator_menu_item_new (); gtk_widget_show (separator2); @@ -162,17 +164,17 @@ create_mainwin (void) gtk_widget_show (add_files); gtk_container_add (GTK_CONTAINER (File_menu), add_files); - image424 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image424); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image424); + image431 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image431); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image431); add_folders = gtk_image_menu_item_new_with_mnemonic (_("Add folder(s)")); gtk_widget_show (add_folders); gtk_container_add (GTK_CONTAINER (File_menu), add_folders); - image425 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image425); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image425); + image432 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image432); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image432); add_location1 = gtk_menu_item_new_with_mnemonic (_("Add location")); gtk_widget_show (add_location1); @@ -214,9 +216,9 @@ create_mainwin (void) GDK_Q, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image426 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); - gtk_widget_show (image426); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image426); + image433 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image433); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image433); Edit = gtk_menu_item_new_with_mnemonic (_("_Edit")); gtk_widget_show (Edit); @@ -229,9 +231,9 @@ create_mainwin (void) gtk_widget_show (clear1); gtk_container_add (GTK_CONTAINER (Edit_menu), clear1); - image427 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); - gtk_widget_show (image427); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image427); + image434 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); + gtk_widget_show (image434); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image434); select_all1 = gtk_menu_item_new_with_mnemonic (_("Select all")); gtk_widget_show (select_all1); @@ -262,9 +264,9 @@ create_mainwin (void) gtk_widget_show (remove1); gtk_container_add (GTK_CONTAINER (Selection_menu), remove1); - image428 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); - gtk_widget_show (image428); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image428); + image435 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_widget_show (image435); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image435); crop1 = gtk_menu_item_new_with_mnemonic (_("Crop")); gtk_widget_show (crop1); @@ -382,6 +384,18 @@ create_mainwin (void) GDK_M, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + separator11 = gtk_separator_menu_item_new (); + gtk_widget_show (separator11); + gtk_container_add (GTK_CONTAINER (Playback_menu), separator11); + gtk_widget_set_sensitive (separator11, FALSE); + + jump_to_current_track1 = gtk_menu_item_new_with_mnemonic (_("Jump to current track")); + gtk_widget_show (jump_to_current_track1); + gtk_container_add (GTK_CONTAINER (Playback_menu), jump_to_current_track1); + gtk_widget_add_accelerator (jump_to_current_track1, "activate", accel_group, + GDK_J, (GdkModifierType) GDK_CONTROL_MASK, + GTK_ACCEL_VISIBLE); + Help = gtk_menu_item_new_with_mnemonic (_("_Help")); gtk_widget_show (Help); gtk_container_add (GTK_CONTAINER (menubar1), Help); @@ -393,9 +407,9 @@ create_mainwin (void) gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (Help_menu), help1); - image429 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image429); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image429); + image436 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image436); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image436); changelog1 = gtk_menu_item_new_with_mnemonic (_("_ChangeLog")); gtk_widget_show (changelog1); @@ -406,11 +420,11 @@ create_mainwin (void) gtk_container_add (GTK_CONTAINER (Help_menu), separator10); gtk_widget_set_sensitive (separator10, FALSE); - gpl1 = gtk_menu_item_new_with_mnemonic ("_GPLv2"); + gpl1 = gtk_menu_item_new_with_mnemonic (_("_GPLv2")); gtk_widget_show (gpl1); gtk_container_add (GTK_CONTAINER (Help_menu), gpl1); - lgpl1 = gtk_menu_item_new_with_mnemonic ("_LGPLv2.1"); + lgpl1 = gtk_menu_item_new_with_mnemonic (_("_LGPLv2.1")); gtk_widget_show (lgpl1); gtk_container_add (GTK_CONTAINER (Help_menu), lgpl1); @@ -423,9 +437,9 @@ create_mainwin (void) gtk_widget_show (about1); gtk_container_add (GTK_CONTAINER (Help_menu), about1); - image430 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); - gtk_widget_show (image430); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image430); + image437 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); + gtk_widget_show (image437); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image437); hbox2 = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox2); @@ -662,6 +676,9 @@ create_mainwin (void) g_signal_connect ((gpointer) stop_after_current, "activate", G_CALLBACK (on_stop_after_current_activate), NULL); + g_signal_connect ((gpointer) jump_to_current_track1, "activate", + G_CALLBACK (on_jump_to_current_track1_activate), + NULL); g_signal_connect ((gpointer) help1, "activate", G_CALLBACK (on_help1_activate), NULL); @@ -700,12 +717,12 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, File, "File"); GLADE_HOOKUP_OBJECT (mainwin, File_menu, "File_menu"); GLADE_HOOKUP_OBJECT (mainwin, open, "open"); - GLADE_HOOKUP_OBJECT (mainwin, image423, "image423"); + GLADE_HOOKUP_OBJECT (mainwin, image430, "image430"); GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2"); GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files"); - GLADE_HOOKUP_OBJECT (mainwin, image424, "image424"); + GLADE_HOOKUP_OBJECT (mainwin, image431, "image431"); GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders"); - GLADE_HOOKUP_OBJECT (mainwin, image425, "image425"); + GLADE_HOOKUP_OBJECT (mainwin, image432, "image432"); GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1"); GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1"); GLADE_HOOKUP_OBJECT (mainwin, new_playlist1, "new_playlist1"); @@ -714,18 +731,18 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, playlist_save_as, "playlist_save_as"); GLADE_HOOKUP_OBJECT (mainwin, separator8, "separator8"); GLADE_HOOKUP_OBJECT (mainwin, quit, "quit"); - GLADE_HOOKUP_OBJECT (mainwin, image426, "image426"); + GLADE_HOOKUP_OBJECT (mainwin, image433, "image433"); GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit"); GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu"); GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1"); - GLADE_HOOKUP_OBJECT (mainwin, image427, "image427"); + GLADE_HOOKUP_OBJECT (mainwin, image434, "image434"); GLADE_HOOKUP_OBJECT (mainwin, select_all1, "select_all1"); GLADE_HOOKUP_OBJECT (mainwin, deselect_all1, "deselect_all1"); GLADE_HOOKUP_OBJECT (mainwin, invert_selection1, "invert_selection1"); GLADE_HOOKUP_OBJECT (mainwin, Selection, "Selection"); GLADE_HOOKUP_OBJECT (mainwin, Selection_menu, "Selection_menu"); GLADE_HOOKUP_OBJECT (mainwin, remove1, "remove1"); - GLADE_HOOKUP_OBJECT (mainwin, image428, "image428"); + GLADE_HOOKUP_OBJECT (mainwin, image435, "image435"); GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1"); GLADE_HOOKUP_OBJECT (mainwin, find1, "find1"); GLADE_HOOKUP_OBJECT (mainwin, separator5, "separator5"); @@ -751,17 +768,19 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, scroll_follows_playback, "scroll_follows_playback"); GLADE_HOOKUP_OBJECT (mainwin, cursor_follows_playback, "cursor_follows_playback"); GLADE_HOOKUP_OBJECT (mainwin, stop_after_current, "stop_after_current"); + GLADE_HOOKUP_OBJECT (mainwin, separator11, "separator11"); + GLADE_HOOKUP_OBJECT (mainwin, jump_to_current_track1, "jump_to_current_track1"); GLADE_HOOKUP_OBJECT (mainwin, Help, "Help"); GLADE_HOOKUP_OBJECT (mainwin, Help_menu, "Help_menu"); GLADE_HOOKUP_OBJECT (mainwin, help1, "help1"); - GLADE_HOOKUP_OBJECT (mainwin, image429, "image429"); + GLADE_HOOKUP_OBJECT (mainwin, image436, "image436"); GLADE_HOOKUP_OBJECT (mainwin, changelog1, "changelog1"); GLADE_HOOKUP_OBJECT (mainwin, separator10, "separator10"); GLADE_HOOKUP_OBJECT (mainwin, gpl1, "gpl1"); GLADE_HOOKUP_OBJECT (mainwin, lgpl1, "lgpl1"); GLADE_HOOKUP_OBJECT (mainwin, separator9, "separator9"); GLADE_HOOKUP_OBJECT (mainwin, about1, "about1"); - GLADE_HOOKUP_OBJECT (mainwin, image430, "image430"); + GLADE_HOOKUP_OBJECT (mainwin, image437, "image437"); GLADE_HOOKUP_OBJECT (mainwin, hbox2, "hbox2"); GLADE_HOOKUP_OBJECT (mainwin, hbox3, "hbox3"); GLADE_HOOKUP_OBJECT (mainwin, stopbtn, "stopbtn"); diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c index 02b41a87..61fdc925 100644 --- a/plugins/gtkui/plcommon.c +++ b/plugins/gtkui/plcommon.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <gdk/gdkkeysyms.h> #include "gtkui.h" #include "plcommon.h" #include "coverart.h" @@ -41,6 +42,8 @@ extern GdkPixbuf *play16_pixbuf; extern GdkPixbuf *pause16_pixbuf; extern GdkPixbuf *buffering16_pixbuf; +static int clicked_idx = -1; + void write_column_config (const char *name, int idx, const char *title, int width, int align_right, int id, const char *format) { char key[128]; @@ -259,8 +262,6 @@ main_reload_metadata_activate trkproperties_fill_metadata (); } -int clicked_idx = -1; - void main_properties_activate (GtkMenuItem *menuitem, gpointer user_data) |