diff options
Diffstat (limited to 'plugins')
73 files changed, 198 insertions, 179 deletions
diff --git a/plugins/aac/aac.c b/plugins/aac/aac.c index 8796da83..abee9770 100644 --- a/plugins/aac/aac.c +++ b/plugins/aac/aac.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or @@ -492,7 +492,10 @@ aac_init (DB_fileinfo_t *_info, DB_playItem_t *it) { _info->fmt.channelmask |= 1 << i; } info->noremap = 0; - info->remap[0] = -1; + for (int i = 0; i < sizeof (info->remap) / sizeof (int); i++) { + info->remap[i] = -1; + } + trace ("init success\n"); return 0; @@ -559,8 +562,6 @@ aac_read (DB_fileinfo_t *_info, char *bytes, int size) { int i, j; if (info->remap[0] == -1) { // build remap mtx - memset (info->remap, -1, sizeof (info->remap)); - // FIXME: should build channelmask 1st; then remap based on channelmask for (i = 0; i < _info->fmt.channels; i++) { switch (info->frame_info.channel_position[i]) { diff --git a/plugins/aac/aac_parser.c b/plugins/aac/aac_parser.c index 3a25622e..8214eacb 100644 --- a/plugins/aac/aac_parser.c +++ b/plugins/aac/aac_parser.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/aac/aac_parser.h b/plugins/aac/aac_parser.h index 255b58e3..315d7892 100644 --- a/plugins/aac/aac_parser.h +++ b/plugins/aac/aac_parser.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index 799dab72..37fe2adf 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c index 7964c311..caaa949c 100644 --- a/plugins/ao/plugin.c +++ b/plugins/ao/plugin.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c index 32cd1b96..cc0e632e 100644 --- a/plugins/artwork/artwork.c +++ b/plugins/artwork/artwork.c @@ -139,7 +139,7 @@ esc_char (char c) { return '_'; } -int +static int make_cache_dir_path (char *path, int size, const char *artist, int img_size) { char esc_artist[PATH_MAX]; int i; @@ -174,29 +174,32 @@ make_cache_dir_path (char *path, int size, const char *artist, int img_size) { return sz; } -int +static int make_cache_path2 (char *path, int size, const char *fname, const char *album, const char *artist, int img_size) { - if (!album) { - album = ""; - } - if (!artist) { - artist = ""; - } + *path = 0; + + int unk = 0; + int unk_artist = 0; - if (*album && !(*artist)) { - artist = album; + if (!album || !(*album)) { + album = "Unknown album"; + unk = 1; + } + if (!artist || !(*artist)) { + artist = "Unknown artist"; + unk_artist = 1; } - if (!*artist || !*album) + if (unk) { if (fname) { - // album=escape(path), artist=uknown - artist = "Unknown artist"; album = fname; } + else if (!unk_artist) { + album = artist; + } else { - trace ("artist or album is empty, give up\n"); - *path = 0; + trace ("not possible to get any unique album name\n"); return -1; } } @@ -225,12 +228,12 @@ make_cache_path2 (char *path, int size, const char *fname, const char *album, co } } -void +static void make_cache_path (char *path, int size, const char *album, const char *artist, int img_size) { make_cache_path2 (path, size, NULL, album, artist, img_size); } -void +static void queue_add (const char *fname, const char *artist, const char *album, int img_size, artwork_callback callback, void *user_data) { if (!artist) { artist = ""; @@ -274,7 +277,7 @@ queue_add (const char *fname, const char *artist, const char *album, int img_siz deadbeef->cond_signal (cond); } -void +static void queue_pop (void) { deadbeef->mutex_lock (mutex); cover_query_t *next = queue ? queue->next : NULL; @@ -481,7 +484,7 @@ jpeg_resize (const char *fname, const char *outname, int scaled_size) { return 0; } -int +static int png_resize (const char *fname, const char *outname, int scaled_size) { png_structp png_ptr = NULL; png_infop info_ptr = NULL; @@ -629,6 +632,8 @@ png_resize (const char *fname, const char *outname, int scaled_size) { for (row = 0; row < height; row++) row_pointers[row] = NULL; + png_read_update_info(png_ptr, info_ptr); + for (row = 0; row < height; row++) row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr)); @@ -859,6 +864,7 @@ copy_file (const char *in, const char *out, int img_size) { } static const char *filter_custom_mask = NULL; + static int filter_custom (const struct dirent *f) { @@ -1397,18 +1403,11 @@ find_image (const char *path) { return NULL; } -char* +static char* get_album_art (const char *fname, const char *artist, const char *album, int size, artwork_callback callback, void *user_data) { char path [1024]; -// if (!deadbeef->is_local_file (fname)) { -// if (callback) { -// callback (NULL, NULL, NULL, user_data); -// } -// return NULL; -// } - make_cache_path2 (path, sizeof (path), fname, album, artist, size); char *p = find_image (path); if (p) { @@ -1471,13 +1470,7 @@ get_album_art_sync (const char *fname, const char *artist, const char *album, in return image_fname; } -DB_plugin_t * -artwork_load (DB_functions_t *api) { - deadbeef = api; - return DB_PLUGIN (&plugin); -} - -void +static void artwork_reset (int fast) { if (fast) { // if (current_file) { @@ -1691,3 +1684,10 @@ static DB_artwork_plugin_t plugin = { .make_cache_path = make_cache_path, .make_cache_path2 = make_cache_path2, }; + +DB_plugin_t * +artwork_load (DB_functions_t *api) { + deadbeef = api; + return DB_PLUGIN (&plugin); +} + diff --git a/plugins/artwork/artwork.h b/plugins/artwork/artwork.h index 850937e1..f4b278e3 100644 --- a/plugins/artwork/artwork.h +++ b/plugins/artwork/artwork.h @@ -46,6 +46,7 @@ typedef struct { char* (*get_album_art_sync) (const char *fname, const char *artist, const char *album, int size); // creates full path string for cache storage + // NOTE: this function is deprecated, please use make_cache_path2 void (*make_cache_path) (char *path, int size, const char *album, const char *artist, int img_size); // creates full path string for cache storage diff --git a/plugins/converter/converter.c b/plugins/converter/converter.c index fc8989c4..f87f3f23 100644 --- a/plugins/converter/converter.c +++ b/plugins/converter/converter.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or @@ -1134,11 +1134,16 @@ error: *o++ = *p++; } *o = 0; - // FIXME: need to delete all colon-fields, except the URI - deadbeef->pl_replace_meta (out_it, ":URI", unesc_path); - deadbeef->pl_delete_meta (out_it, ":TRACKNUM"); - deadbeef->pl_delete_meta (out_it, "cuesheet"); deadbeef->pl_set_item_flags (out_it, 0); + DB_metaInfo_t *m = deadbeef->pl_get_metadata_head (out_it); + while (m) { + DB_metaInfo_t *next = m->next; + if (m->key[0] == ':' || m->key[0] == '!' || !strcasecmp (m->key, "cuesheet")) { + deadbeef->pl_delete_metadata (out_it, m); + } + m = next; + } + deadbeef->pl_replace_meta (out_it, ":URI", unesc_path); } uint32_t tagflags = 0; diff --git a/plugins/converter/converter.h b/plugins/converter/converter.h index 63aeb349..ba779315 100644 --- a/plugins/converter/converter.h +++ b/plugins/converter/converter.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/converter/convgui.c b/plugins/converter/convgui.c index a1207da2..21bead78 100644 --- a/plugins/converter/convgui.c +++ b/plugins/converter/convgui.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or @@ -994,6 +994,7 @@ on_edit_encoder_presets_clicked (GtkButton *button, gtk_tree_path_free (path); } } + on_encoder_preset_cursor_changed (GTK_TREE_VIEW (list), NULL); gtk_dialog_run (GTK_DIALOG (dlg)); gtk_widget_destroy (dlg); } @@ -1563,7 +1564,7 @@ GtkWidget* title_formatting_help_link_create (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { - GtkWidget *link = gtk_link_button_new_with_label ("http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting", _("Help")); + GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting", _("Help")); return link; } @@ -1571,7 +1572,7 @@ GtkWidget* encoder_cmdline_help_link_create (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { - GtkWidget *link = gtk_link_button_new_with_label ("http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Encoder_Command_Line", _("Help")); + GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Encoder-Command-Line", _("Help")); return link; } diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c index 6e21aa9f..d2ea04dc 100644 --- a/plugins/dca/dcaplug.c +++ b/plugins/dca/dcaplug.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/dsp_libsrc/src.c b/plugins/dsp_libsrc/src.c index 786bbcda..7c0e8c0c 100644 --- a/plugins/dsp_libsrc/src.c +++ b/plugins/dsp_libsrc/src.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/dsp_libsrc/src.h b/plugins/dsp_libsrc/src.h index 4359af57..f894a6ad 100644 --- a/plugins/dsp_libsrc/src.h +++ b/plugins/dsp_libsrc/src.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c index 19129f96..5db910e4 100644 --- a/plugins/ffap/ffap.c +++ b/plugins/ffap/ffap.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben@geexbox.org> based upon libdemac from Dave Chapman. diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c index 34116437..960d19cc 100644 --- a/plugins/ffmpeg/ffmpeg.c +++ b/plugins/ffmpeg/ffmpeg.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/flac/flac.c b/plugins/flac/flac.c index 93ed1224..40744ff6 100644 --- a/plugins/flac/flac.c +++ b/plugins/flac/flac.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> Redistribution and use in source and binary forms, with or without diff --git a/plugins/gtkui/actions.c b/plugins/gtkui/actions.c index 74a2175f..fd18f317 100644 --- a/plugins/gtkui/actions.c +++ b/plugins/gtkui/actions.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>, Viktor Semykin <thesame.ml@gmail.com> diff --git a/plugins/gtkui/actions.h b/plugins/gtkui/actions.h index e2c1f5a5..64b9053d 100644 --- a/plugins/gtkui/actions.h +++ b/plugins/gtkui/actions.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net>, Viktor Semykin <thesame.ml@gmail.com> diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 8185fe66..0f45d6fd 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify @@ -127,6 +127,7 @@ on_playbtn_clicked (GtkButton *button, if (cur != -1) { ddb_playItem_t *it = deadbeef->plt_get_item_for_idx (plt, cur, PL_MAIN); ddb_playItem_t *it_playing = deadbeef->streamer_get_playing_track (); + if (it) { deadbeef->pl_item_unref (it); } @@ -137,7 +138,7 @@ on_playbtn_clicked (GtkButton *button, deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0); } else { - deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 1, 0); + deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 0, 0); } } else { @@ -152,6 +153,9 @@ on_playbtn_clicked (GtkButton *button, cur = deadbeef->plt_get_cursor (plt, PL_MAIN); deadbeef->plt_unref (plt); } + if (cur == -1) { + cur = 0; + } deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0); } } @@ -630,7 +634,7 @@ GtkWidget* title_formatting_help_link_create (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2) { - GtkWidget *link = gtk_link_button_new_with_label ("http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Title_Formatting", "Help"); + GtkWidget *link = gtk_link_button_new_with_label ("http://github.com/Alexey-Yakovenko/deadbeef/wiki/Title-formatting", "Help"); return link; } diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index cd5d35fb..b5e1f5f0 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/coverart.c b/plugins/gtkui/coverart.c index 0ff63ceb..6953e996 100644 --- a/plugins/gtkui/coverart.c +++ b/plugins/gtkui/coverart.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/coverart.h b/plugins/gtkui/coverart.h index 47627fe7..9eb40e4a 100644 --- a/plugins/gtkui/coverart.h +++ b/plugins/gtkui/coverart.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/ddbcellrenderertextmultiline.c b/plugins/gtkui/ddbcellrenderertextmultiline.c index 57d2f23c..4ecfa04f 100644 --- a/plugins/gtkui/ddbcellrenderertextmultiline.c +++ b/plugins/gtkui/ddbcellrenderertextmultiline.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c index 2234643d..a79a5ab2 100644 --- a/plugins/gtkui/ddblistview.c +++ b/plugins/gtkui/ddblistview.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/ddblistview.h b/plugins/gtkui/ddblistview.h index 372bcb3c..08d8c8b7 100644 --- a/plugins/gtkui/ddblistview.h +++ b/plugins/gtkui/ddblistview.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/ddbseekbar.c b/plugins/gtkui/ddbseekbar.c index 0dbb7594..397b0ae2 100644 --- a/plugins/gtkui/ddbseekbar.c +++ b/plugins/gtkui/ddbseekbar.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c index 5bc1234b..7004b5ce 100644 --- a/plugins/gtkui/ddbtabstrip.c +++ b/plugins/gtkui/ddbtabstrip.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/ddbtabstrip.h b/plugins/gtkui/ddbtabstrip.h index 652485c7..9d7a673f 100644 --- a/plugins/gtkui/ddbtabstrip.h +++ b/plugins/gtkui/ddbtabstrip.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/ddbvolumebar.c b/plugins/gtkui/ddbvolumebar.c index dfb3de1f..e8e9c36e 100644 --- a/plugins/gtkui/ddbvolumebar.c +++ b/plugins/gtkui/ddbvolumebar.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or @@ -285,7 +285,6 @@ on_volumebar_scroll_event (GtkWidget *widget, vol = -range; } deadbeef->volume_set_db (vol); - GtkWidget *volumebar = DDB_VOLUMEBAR (widget); gtk_widget_queue_draw (widget); char s[100]; int db = deadbeef->volume_get_db (); diff --git a/plugins/gtkui/ddbvolumebar.h b/plugins/gtkui/ddbvolumebar.h index d560a5cd..976be54f 100644 --- a/plugins/gtkui/ddbvolumebar.h +++ b/plugins/gtkui/ddbvolumebar.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index 59ac4533..6e6a9e9f 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -58,7 +58,7 @@ <signal name="activate" handler="on_open_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image647"> + <widget class="GtkImage" id="image663"> <property name="visible">True</property> <property name="stock">gtk-open</property> <property name="icon_size">1</property> @@ -85,7 +85,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="image648"> + <widget class="GtkImage" id="image664"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -106,7 +106,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="image649"> + <widget class="GtkImage" id="image665"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -175,7 +175,7 @@ <signal name="activate" handler="on_quit_activate" last_modification_time="Sat, 04 Jul 2009 12:57:58 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image650"> + <widget class="GtkImage" id="image666"> <property name="visible">True</property> <property name="stock">gtk-quit</property> <property name="icon_size">1</property> @@ -209,7 +209,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="image651"> + <widget class="GtkImage" id="image667"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> @@ -266,7 +266,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="image652"> + <widget class="GtkImage" id="image668"> <property name="visible">True</property> <property name="stock">gtk-remove</property> <property name="icon_size">1</property> @@ -572,7 +572,7 @@ <child> <widget class="GtkCheckMenuItem" id="stop_after_current"> <property name="visible">True</property> - <property name="label" translatable="yes">Stop after current</property> + <property name="label" translatable="yes">Stop after current track</property> <property name="use_underline">True</property> <property name="active">False</property> <signal name="activate" handler="on_stop_after_current_activate" last_modification_time="Sun, 20 Dec 2009 13:32:19 GMT"/> @@ -625,7 +625,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="image653"> + <widget class="GtkImage" id="image669"> <property name="visible">True</property> <property name="stock">gtk-help</property> <property name="icon_size">1</property> @@ -685,7 +685,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="image654"> + <widget class="GtkImage" id="image670"> <property name="visible">True</property> <property name="stock">gtk-about</property> <property name="icon_size">1</property> @@ -706,7 +706,7 @@ <signal name="activate" handler="on_translators1_activate" last_modification_time="Sun, 19 Sep 2010 13:38:07 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image655"> + <widget class="GtkImage" id="image671"> <property name="visible">True</property> <property name="stock">gtk-about</property> <property name="icon_size">1</property> @@ -2841,7 +2841,7 @@ Album</property> <widget class="GtkCheckButton" id="reset_autostop"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Auto-reset "Stop after current"</property> + <property name="label" translatable="yes">"Stop after current track" option will switch off after triggering</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> @@ -2861,7 +2861,7 @@ Album</property> <widget class="GtkCheckButton" id="reset_autostopalbum"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Auto-reset "Stop after current album"</property> + <property name="label" translatable="yes">"Stop after current album" option will switch off after triggering</property> <property name="use_underline">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> diff --git a/plugins/gtkui/drawing.h b/plugins/gtkui/drawing.h index 192b7a94..85a2f580 100644 --- a/plugins/gtkui/drawing.h +++ b/plugins/gtkui/drawing.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/dspconfig.c b/plugins/gtkui/dspconfig.c index 1fdbb79f..a3521dbf 100644 --- a/plugins/gtkui/dspconfig.c +++ b/plugins/gtkui/dspconfig.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/dspconfig.h b/plugins/gtkui/dspconfig.h index 79dbf14b..8e07c495 100644 --- a/plugins/gtkui/dspconfig.h +++ b/plugins/gtkui/dspconfig.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/eq.c b/plugins/gtkui/eq.c index 7ddd0986..33e65462 100644 --- a/plugins/gtkui/eq.c +++ b/plugins/gtkui/eq.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/eq.h b/plugins/gtkui/eq.h index 4ad46209..433d938e 100644 --- a/plugins/gtkui/eq.h +++ b/plugins/gtkui/eq.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/fileman.c b/plugins/gtkui/fileman.c index 24b9ca8a..7ae71006 100644 --- a/plugins/gtkui/fileman.c +++ b/plugins/gtkui/fileman.c @@ -113,7 +113,7 @@ open_files_worker (void *data) { deadbeef->pl_set_cursor (PL_MAIN, 0); deadbeef->conf_save (); deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0); - deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 1, 0); + deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, 0, 0); } void diff --git a/plugins/gtkui/gdkdrawing.c b/plugins/gtkui/gdkdrawing.c index 4c015589..7691201e 100644 --- a/plugins/gtkui/gdkdrawing.c +++ b/plugins/gtkui/gdkdrawing.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c index a3cca159..17f1f9d9 100644 --- a/plugins/gtkui/gtkui.c +++ b/plugins/gtkui/gtkui.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or @@ -592,7 +592,7 @@ gtkui_on_configchanged (void *data) { // cursor follows playback gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "cursor_follows_playback")), deadbeef->conf_get_int ("playlist.scroll.cursorfollowplayback", 1) ? TRUE : FALSE); - // stop after current + // stop after current track int stop_after_current = deadbeef->conf_get_int ("playlist.stop_after_current", 0); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (lookup_widget (mainwin, "stop_after_current")), stop_after_current ? TRUE : FALSE); @@ -1178,9 +1178,14 @@ gtkui_quit_cb (void *ctx) { if (response != GTK_RESPONSE_YES) { return FALSE; } + else { + exit (0); + } + } + else { + progress_abort (); + deadbeef->sendmessage (DB_EV_TERMINATE, 0, 0, 0); } - progress_abort (); - deadbeef->sendmessage (DB_EV_TERMINATE, 0, 0, 0); return FALSE; } diff --git a/plugins/gtkui/gtkui.h b/plugins/gtkui/gtkui.h index 5ed95c8c..48ba0974 100644 --- a/plugins/gtkui/gtkui.h +++ b/plugins/gtkui/gtkui.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/gtkui_api.h b/plugins/gtkui/gtkui_api.h index a3dd95d2..f7d2479b 100644 --- a/plugins/gtkui/gtkui_api.h +++ b/plugins/gtkui/gtkui_api.h @@ -35,7 +35,7 @@ // for information, about how to port your plugin to the new API correctly, // and to learn more about design mode programming, // please visit the following page: -// http://sourceforge.net/apps/mediawiki/deadbeef/index.php?title=Porting_GUI_plugins_to_0.6 +// http://github.com/Alexey-Yakovenko/deadbeef/wiki/Porting-GUI-plugins-to-deadbeef-from-0.5.x-to-0.6.0 #if GTK_CHECK_VERSION(3,0,0) #define DDB_GTKUI_PLUGIN_ID "gtkui3_1" diff --git a/plugins/gtkui/gtkuigl.c b/plugins/gtkui/gtkuigl.c index 25226731..21af0a12 100644 --- a/plugins/gtkui/gtkuigl.c +++ b/plugins/gtkui/gtkuigl.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/gtkuigl.h b/plugins/gtkui/gtkuigl.h index 88e2d5c1..baeed105 100644 --- a/plugins/gtkui/gtkuigl.h +++ b/plugins/gtkui/gtkuigl.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index d17269c6..6f8ea8c6 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 *image647; + GtkWidget *image663; GtkWidget *separator2; GtkWidget *add_files; - GtkWidget *image648; + GtkWidget *image664; GtkWidget *add_folders; - GtkWidget *image649; + GtkWidget *image665; GtkWidget *add_location1; GtkWidget *separatormenuitem1; GtkWidget *new_playlist1; @@ -48,18 +48,18 @@ create_mainwin (void) GtkWidget *playlist_save_as; GtkWidget *separator8; GtkWidget *quit; - GtkWidget *image650; + GtkWidget *image666; GtkWidget *Edit; GtkWidget *Edit_menu; GtkWidget *clear1; - GtkWidget *image651; + GtkWidget *image667; GtkWidget *select_all1; GtkWidget *deselect_all1; GtkWidget *invert_selection1; GtkWidget *Selection; GtkWidget *Selection_menu; GtkWidget *remove1; - GtkWidget *image652; + GtkWidget *image668; GtkWidget *crop1; GtkWidget *find1; GtkWidget *sort_by1; @@ -102,16 +102,16 @@ create_mainwin (void) GtkWidget *Help; GtkWidget *Help_menu; GtkWidget *help1; - GtkWidget *image653; + GtkWidget *image669; GtkWidget *changelog1; GtkWidget *separator10; GtkWidget *gpl1; GtkWidget *lgpl1; GtkWidget *separator9; GtkWidget *about1; - GtkWidget *image654; + GtkWidget *image670; GtkWidget *translators1; - GtkWidget *image655; + GtkWidget *image671; GtkWidget *plugins_bottom_vbox; GtkWidget *statusbar; @@ -139,9 +139,9 @@ create_mainwin (void) gtk_widget_show (open); gtk_container_add (GTK_CONTAINER (File_menu), open); - image647 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); - gtk_widget_show (image647); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image647); + image663 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU); + gtk_widget_show (image663); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (open), image663); separator2 = gtk_separator_menu_item_new (); gtk_widget_show (separator2); @@ -152,17 +152,17 @@ create_mainwin (void) gtk_widget_show (add_files); gtk_container_add (GTK_CONTAINER (File_menu), add_files); - image648 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image648); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image648); + image664 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image664); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_files), image664); 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); - image649 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); - gtk_widget_show (image649); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image649); + image665 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU); + gtk_widget_show (image665); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_folders), image665); add_location1 = gtk_menu_item_new_with_mnemonic (_("Add location")); gtk_widget_show (add_location1); @@ -194,9 +194,9 @@ create_mainwin (void) gtk_widget_show (quit); gtk_container_add (GTK_CONTAINER (File_menu), quit); - image650 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); - gtk_widget_show (image650); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image650); + image666 = gtk_image_new_from_stock ("gtk-quit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image666); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (quit), image666); Edit = gtk_menu_item_new_with_mnemonic (_("_Edit")); gtk_widget_show (Edit); @@ -209,9 +209,9 @@ create_mainwin (void) gtk_widget_show (clear1); gtk_container_add (GTK_CONTAINER (Edit_menu), clear1); - image651 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); - gtk_widget_show (image651); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image651); + image667 = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_MENU); + gtk_widget_show (image667); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear1), image667); select_all1 = gtk_menu_item_new_with_mnemonic (_("Select all")); gtk_widget_show (select_all1); @@ -236,9 +236,9 @@ create_mainwin (void) gtk_widget_show (remove1); gtk_container_add (GTK_CONTAINER (Selection_menu), remove1); - image652 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); - gtk_widget_show (image652); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image652); + image668 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_MENU); + gtk_widget_show (image668); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image668); crop1 = gtk_menu_item_new_with_mnemonic (_("Crop")); gtk_widget_show (crop1); @@ -383,7 +383,7 @@ create_mainwin (void) gtk_widget_show (cursor_follows_playback); gtk_container_add (GTK_CONTAINER (Playback_menu), cursor_follows_playback); - stop_after_current = gtk_check_menu_item_new_with_mnemonic (_("Stop after current")); + stop_after_current = gtk_check_menu_item_new_with_mnemonic (_("Stop after current track")); gtk_widget_show (stop_after_current); gtk_container_add (GTK_CONTAINER (Playback_menu), stop_after_current); @@ -411,9 +411,9 @@ create_mainwin (void) gtk_widget_show (help1); gtk_container_add (GTK_CONTAINER (Help_menu), help1); - image653 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); - gtk_widget_show (image653); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image653); + image669 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU); + gtk_widget_show (image669); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image669); changelog1 = gtk_menu_item_new_with_mnemonic (_("_ChangeLog")); gtk_widget_show (changelog1); @@ -441,17 +441,17 @@ create_mainwin (void) gtk_widget_show (about1); gtk_container_add (GTK_CONTAINER (Help_menu), about1); - image654 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); - gtk_widget_show (image654); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image654); + image670 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); + gtk_widget_show (image670); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about1), image670); translators1 = gtk_image_menu_item_new_with_mnemonic (_("_Translators")); gtk_widget_show (translators1); gtk_container_add (GTK_CONTAINER (Help_menu), translators1); - image655 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); - gtk_widget_show (image655); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image655); + image671 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU); + gtk_widget_show (image671); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (translators1), image671); plugins_bottom_vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (plugins_bottom_vbox); @@ -619,12 +619,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, image647, "image647"); + GLADE_HOOKUP_OBJECT (mainwin, image663, "image663"); GLADE_HOOKUP_OBJECT (mainwin, separator2, "separator2"); GLADE_HOOKUP_OBJECT (mainwin, add_files, "add_files"); - GLADE_HOOKUP_OBJECT (mainwin, image648, "image648"); + GLADE_HOOKUP_OBJECT (mainwin, image664, "image664"); GLADE_HOOKUP_OBJECT (mainwin, add_folders, "add_folders"); - GLADE_HOOKUP_OBJECT (mainwin, image649, "image649"); + GLADE_HOOKUP_OBJECT (mainwin, image665, "image665"); GLADE_HOOKUP_OBJECT (mainwin, add_location1, "add_location1"); GLADE_HOOKUP_OBJECT (mainwin, separatormenuitem1, "separatormenuitem1"); GLADE_HOOKUP_OBJECT (mainwin, new_playlist1, "new_playlist1"); @@ -632,18 +632,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, image650, "image650"); + GLADE_HOOKUP_OBJECT (mainwin, image666, "image666"); GLADE_HOOKUP_OBJECT (mainwin, Edit, "Edit"); GLADE_HOOKUP_OBJECT (mainwin, Edit_menu, "Edit_menu"); GLADE_HOOKUP_OBJECT (mainwin, clear1, "clear1"); - GLADE_HOOKUP_OBJECT (mainwin, image651, "image651"); + GLADE_HOOKUP_OBJECT (mainwin, image667, "image667"); 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, image652, "image652"); + GLADE_HOOKUP_OBJECT (mainwin, image668, "image668"); GLADE_HOOKUP_OBJECT (mainwin, crop1, "crop1"); GLADE_HOOKUP_OBJECT (mainwin, find1, "find1"); GLADE_HOOKUP_OBJECT (mainwin, sort_by1, "sort_by1"); @@ -684,16 +684,16 @@ create_mainwin (void) GLADE_HOOKUP_OBJECT (mainwin, Help, "Help"); GLADE_HOOKUP_OBJECT (mainwin, Help_menu, "Help_menu"); GLADE_HOOKUP_OBJECT (mainwin, help1, "help1"); - GLADE_HOOKUP_OBJECT (mainwin, image653, "image653"); + GLADE_HOOKUP_OBJECT (mainwin, image669, "image669"); 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, image654, "image654"); + GLADE_HOOKUP_OBJECT (mainwin, image670, "image670"); GLADE_HOOKUP_OBJECT (mainwin, translators1, "translators1"); - GLADE_HOOKUP_OBJECT (mainwin, image655, "image655"); + GLADE_HOOKUP_OBJECT (mainwin, image671, "image671"); GLADE_HOOKUP_OBJECT (mainwin, plugins_bottom_vbox, "plugins_bottom_vbox"); GLADE_HOOKUP_OBJECT (mainwin, statusbar, "statusbar"); @@ -1842,11 +1842,11 @@ create_prefwin (void) gtk_widget_show (ignore_archives); gtk_box_pack_start (GTK_BOX (vbox8), ignore_archives, FALSE, FALSE, 0); - reset_autostop = gtk_check_button_new_with_mnemonic (_("Auto-reset \"Stop after current\"")); + reset_autostop = gtk_check_button_new_with_mnemonic (_("\"Stop after current track\" option will switch off after triggering")); gtk_widget_show (reset_autostop); gtk_box_pack_start (GTK_BOX (vbox8), reset_autostop, FALSE, FALSE, 0); - reset_autostopalbum = gtk_check_button_new_with_mnemonic (_("Auto-reset \"Stop after current album\"")); + reset_autostopalbum = gtk_check_button_new_with_mnemonic (_("\"Stop after current album\" option will switch off after triggering")); gtk_widget_show (reset_autostopalbum); gtk_box_pack_start (GTK_BOX (vbox8), reset_autostopalbum, FALSE, FALSE, 0); diff --git a/plugins/gtkui/mainplaylist.c b/plugins/gtkui/mainplaylist.c index fc781a39..35fb60b0 100644 --- a/plugins/gtkui/mainplaylist.c +++ b/plugins/gtkui/mainplaylist.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/mainplaylist.h b/plugins/gtkui/mainplaylist.h index a746b395..cb305868 100644 --- a/plugins/gtkui/mainplaylist.h +++ b/plugins/gtkui/mainplaylist.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c index d7df4f62..9545abdb 100644 --- a/plugins/gtkui/plcommon.c +++ b/plugins/gtkui/plcommon.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/plcommon.h b/plugins/gtkui/plcommon.h index ed68320d..6f5f7ae1 100644 --- a/plugins/gtkui/plcommon.h +++ b/plugins/gtkui/plcommon.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/pluginconf.c b/plugins/gtkui/pluginconf.c index beb36304..b933d69e 100644 --- a/plugins/gtkui/pluginconf.c +++ b/plugins/gtkui/pluginconf.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/pluginconf.h b/plugins/gtkui/pluginconf.h index 6717aa2f..21a08ed1 100644 --- a/plugins/gtkui/pluginconf.h +++ b/plugins/gtkui/pluginconf.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c index ed05525a..84f668c5 100644 --- a/plugins/gtkui/prefwin.c +++ b/plugins/gtkui/prefwin.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/progress.c b/plugins/gtkui/progress.c index 1ba1db60..7922777d 100644 --- a/plugins/gtkui/progress.c +++ b/plugins/gtkui/progress.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/progress.h b/plugins/gtkui/progress.h index 9d550e64..e74026c5 100644 --- a/plugins/gtkui/progress.h +++ b/plugins/gtkui/progress.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c index d6c9aed0..f91c9911 100644 --- a/plugins/gtkui/search.c +++ b/plugins/gtkui/search.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/search.h b/plugins/gtkui/search.h index 18a5239d..e3c9bff2 100644 --- a/plugins/gtkui/search.h +++ b/plugins/gtkui/search.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/gtkui/support.h b/plugins/gtkui/support.h index a4e8088e..0410f155 100644 --- a/plugins/gtkui/support.h +++ b/plugins/gtkui/support.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/tagwritersettings.c b/plugins/gtkui/tagwritersettings.c index 57b42596..6ffc568f 100644 --- a/plugins/gtkui/tagwritersettings.c +++ b/plugins/gtkui/tagwritersettings.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/tagwritersettings.h b/plugins/gtkui/tagwritersettings.h index 9686c5f5..0e971487 100644 --- a/plugins/gtkui/tagwritersettings.h +++ b/plugins/gtkui/tagwritersettings.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/timeline.c b/plugins/gtkui/timeline.c index 6338bc90..becefe4b 100644 --- a/plugins/gtkui/timeline.c +++ b/plugins/gtkui/timeline.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/timeline.h b/plugins/gtkui/timeline.h index 589c458b..f73bc633 100644 --- a/plugins/gtkui/timeline.h +++ b/plugins/gtkui/timeline.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c index ffeeaf90..6359d5c3 100644 --- a/plugins/gtkui/trkproperties.c +++ b/plugins/gtkui/trkproperties.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/trkproperties.h b/plugins/gtkui/trkproperties.h index 8d438c89..acedb320 100644 --- a/plugins/gtkui/trkproperties.h +++ b/plugins/gtkui/trkproperties.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/widgets.c b/plugins/gtkui/widgets.c index 51b37c28..61db9093 100644 --- a/plugins/gtkui/widgets.c +++ b/plugins/gtkui/widgets.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/widgets.h b/plugins/gtkui/widgets.h index 8521e25d..14d26b9a 100644 --- a/plugins/gtkui/widgets.h +++ b/plugins/gtkui/widgets.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/wingeom.c b/plugins/gtkui/wingeom.c index 60290ffd..f2b538c1 100644 --- a/plugins/gtkui/wingeom.c +++ b/plugins/gtkui/wingeom.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/gtkui/wingeom.h b/plugins/gtkui/wingeom.h index 6ed43a0e..c79517fa 100644 --- a/plugins/gtkui/wingeom.h +++ b/plugins/gtkui/wingeom.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c index 4315602d..dc94e6a3 100644 --- a/plugins/hotkeys/hotkeys.c +++ b/plugins/hotkeys/hotkeys.c @@ -605,7 +605,7 @@ action_play_cb (struct DB_plugin_action_s *action, int ctx) { deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0); } else { - deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 1, 0); + deadbeef->sendmessage (DB_EV_PLAY_CURRENT, 0, 0, 0); } } else { @@ -620,6 +620,9 @@ action_play_cb (struct DB_plugin_action_s *action, int ctx) { cur = deadbeef->plt_get_cursor (plt, PL_MAIN); deadbeef->plt_unref (plt); } + if (cur == -1) { + cur = 0; + } deadbeef->sendmessage (DB_EV_PLAY_NUM, 0, cur, 0); } return 0; @@ -1067,7 +1070,7 @@ static DB_plugin_action_t action_volume_down = { }; static DB_plugin_action_t action_toggle_stop_after_current = { - .title = "Playback/Toggle Stop After Current", + .title = "Playback/Toggle Stop After Current Track", .name = "toggle_stop_after_current", .flags = DB_ACTION_COMMON, .callback2 = action_toggle_stop_after_current_cb, diff --git a/plugins/pltbrowser/support.h b/plugins/pltbrowser/support.h index a4e8088e..0410f155 100644 --- a/plugins/pltbrowser/support.h +++ b/plugins/pltbrowser/support.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/sid/csid.h b/plugins/sid/csid.h index 005fa2fa..67c092da 100644 --- a/plugins/sid/csid.h +++ b/plugins/sid/csid.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software: you can redistribute it and/or modify diff --git a/plugins/soundtouch/plugin.c b/plugins/soundtouch/plugin.c index fb224bbb..7f7c3f74 100644 --- a/plugins/soundtouch/plugin.c +++ b/plugins/soundtouch/plugin.c @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/soundtouch/st.cpp b/plugins/soundtouch/st.cpp index 5433e3ce..403a1524 100644 --- a/plugins/soundtouch/st.cpp +++ b/plugins/soundtouch/st.cpp @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/soundtouch/st.h b/plugins/soundtouch/st.h index fbcbdfa0..2fb877e6 100644 --- a/plugins/soundtouch/st.h +++ b/plugins/soundtouch/st.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or diff --git a/plugins/supereq/Equ.h b/plugins/supereq/Equ.h index f67f7aa4..2d34b738 100644 --- a/plugins/supereq/Equ.h +++ b/plugins/supereq/Equ.h @@ -1,5 +1,5 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + DeaDBeeF - The Ultimate Music Player Copyright (C) 2009-2013 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or |