summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deadbeef.h19
-rw-r--r--main.c45
-rw-r--r--plugins.c12
-rw-r--r--plugins/artwork/artwork.c2
-rw-r--r--plugins/gtkui/callbacks.c22
-rw-r--r--plugins/gtkui/fileman.c2
-rw-r--r--plugins/gtkui/gtkui.c4
-rw-r--r--plugins/gtkui/mainplaylist.c2
-rw-r--r--plugins/gtkui/pluginconf.c4
-rw-r--r--plugins/gtkui/prefwin.c44
-rw-r--r--plugins/gtkui/search.c4
-rw-r--r--plugins/hotkeys/hotkeys.c4
12 files changed, 88 insertions, 76 deletions
diff --git a/deadbeef.h b/deadbeef.h
index 07ecfdb9..b143648e 100644
--- a/deadbeef.h
+++ b/deadbeef.h
@@ -253,17 +253,18 @@ enum pl_column_t {
// message ids for communicating with player
enum {
M_SONGFINISHED,
- M_NEXTSONG,
- M_PREVSONG,
- M_PLAYSONG,
- M_PLAYSONGNUM,
- M_STOPSONG,
- M_PAUSESONG,
- M_PLAYRANDOM,
+ M_NEXT,
+ M_PREV,
+ M_PLAY_CURRENT,
+ M_PLAY_NUM,
+ M_STOP,
+ M_PAUSE,
+ M_PLAY_RANDOM,
M_TERMINATE, // must be sent to player thread to terminate
- M_PLAYLISTREFRESH,
+ M_PLAYLIST_REFRESH, // means
M_REINIT_SOUND,
- M_CONFIGCHANGED, // no arguments
+ M_CONFIG_CHANGED, // no arguments
+ M_TOGGLE_PAUSE,
};
// typecasting macros
diff --git a/main.c b/main.c
index 41b0d625..fb21e276 100644
--- a/main.c
+++ b/main.c
@@ -96,6 +96,7 @@ client_exec_command_line (const char *cmdline, int len) {
fprintf (stdout, _(" --play Start playback\n"));
fprintf (stdout, _(" --stop Stop playback\n"));
fprintf (stdout, _(" --pause Pause playback\n"));
+ fprintf (stdout, _(" --toggle-pause Toggle pause\n"));
fprintf (stdout, _(" --next Next song in playlist\n"));
fprintf (stdout, _(" --prev Previous song in playlist\n"));
fprintf (stdout, _(" --random Random song in playlist\n"));
@@ -179,27 +180,31 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
}
}
else if (!strcmp (parg, "--next")) {
- messagepump_push (M_NEXTSONG, 0, 0, 0);
+ messagepump_push (M_NEXT, 0, 0, 0);
return 0;
}
else if (!strcmp (parg, "--prev")) {
- messagepump_push (M_PREVSONG, 0, 0, 0);
+ messagepump_push (M_PREV, 0, 0, 0);
return 0;
}
else if (!strcmp (parg, "--play")) {
- messagepump_push (M_PLAYSONG, 0, 0, 0);
+ messagepump_push (M_PLAY_CURRENT, 0, 0, 0);
return 0;
}
else if (!strcmp (parg, "--stop")) {
- messagepump_push (M_STOPSONG, 0, 0, 0);
+ messagepump_push (M_STOP, 0, 0, 0);
return 0;
}
else if (!strcmp (parg, "--pause")) {
- messagepump_push (M_PAUSESONG, 0, 0, 0);
+ messagepump_push (M_PAUSE, 0, 0, 0);
+ return 0;
+ }
+ else if (!strcmp (parg, "--toggle-pause")) {
+ messagepump_push (M_TOGGLE_PAUSE, 0, 0, 0);
return 0;
}
else if (!strcmp (parg, "--random")) {
- messagepump_push (M_PLAYRANDOM, 0, 0, 0);
+ messagepump_push (M_PLAY_RANDOM, 0, 0, 0);
return 0;
}
else if (!strcmp (parg, "--queue")) {
@@ -251,9 +256,9 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
parg++;
}
deadbeef->pl_add_files_end ();
- messagepump_push (M_PLAYLISTREFRESH, 0, 0, 0);
+ messagepump_push (M_PLAYLIST_REFRESH, 0, 0, 0);
if (!queue) {
- messagepump_push (M_PLAYSONG, 0, 1, 0);
+ messagepump_push (M_PLAY_CURRENT, 0, 1, 0);
return 2; // don't reload playlist at startup
}
}
@@ -375,7 +380,7 @@ player_mainloop (void) {
break;
case M_TERMINATE:
return;
- case M_PLAYSONG:
+ case M_PLAY_CURRENT:
if (p1) {
output->stop ();
pl_playqueue_clear ();
@@ -385,23 +390,29 @@ player_mainloop (void) {
streamer_play_current_track ();
}
break;
- case M_PLAYSONGNUM:
+ case M_PLAY_NUM:
output->stop ();
pl_playqueue_clear ();
streamer_set_nextsong (p1, 1);
break;
- case M_STOPSONG:
+ case M_STOP:
streamer_set_nextsong (-2, 0);
break;
- case M_NEXTSONG:
+ case M_NEXT:
output->stop ();
streamer_move_to_nextsong (1);
break;
- case M_PREVSONG:
+ case M_PREV:
output->stop ();
streamer_move_to_prevsong ();
break;
- case M_PAUSESONG:
+ case M_PAUSE:
+ if (output->state () != OUTPUT_STATE_PAUSED) {
+ output->pause ();
+ plug_trigger_event_paused (1);
+ }
+ break;
+ case M_TOGGLE_PAUSE:
if (output->state () == OUTPUT_STATE_PAUSED) {
output->unpause ();
plug_trigger_event_paused (0);
@@ -411,15 +422,15 @@ player_mainloop (void) {
plug_trigger_event_paused (1);
}
break;
- case M_PLAYRANDOM:
+ case M_PLAY_RANDOM:
output->stop ();
streamer_move_to_randomsong ();
break;
- case M_PLAYLISTREFRESH:
+ case M_PLAYLIST_REFRESH:
pl_save_current ();
plug_trigger_event_playlistchanged ();
break;
- case M_CONFIGCHANGED:
+ case M_CONFIG_CHANGED:
conf_save ();
streamer_configchanged ();
plug_trigger_event (DB_EV_CONFIGCHANGED, 0);
diff --git a/plugins.c b/plugins.c
index 5c2f5d97..2eb861d6 100644
--- a/plugins.c
+++ b/plugins.c
@@ -404,32 +404,32 @@ plug_ev_unsubscribe (DB_plugin_t *plugin, int ev, DB_callback_t callback, uintpt
void
plug_playback_next (void) {
- messagepump_push (M_NEXTSONG, 0, 0, 0);
+ messagepump_push (M_NEXT, 0, 0, 0);
}
void
plug_playback_prev (void) {
- messagepump_push (M_PREVSONG, 0, 0, 0);
+ messagepump_push (M_PREV, 0, 0, 0);
}
void
plug_playback_pause (void) {
- messagepump_push (M_PAUSESONG, 0, 0, 0);
+ messagepump_push (M_TOGGLE_PAUSE, 0, 0, 0);
}
void
plug_playback_stop (void) {
- messagepump_push (M_STOPSONG, 0, 0, 0);
+ messagepump_push (M_STOP, 0, 0, 0);
}
void
plug_playback_play (void) {
- messagepump_push (M_PLAYSONG, 0, 0, 0);
+ messagepump_push (M_PLAY_CURRENT, 0, 0, 0);
}
void
plug_playback_random (void) {
- messagepump_push (M_PLAYRANDOM, 0, 0, 0);
+ messagepump_push (M_PLAY_RANDOM, 0, 0, 0);
}
float
diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c
index e8d175da..f9067dd7 100644
--- a/plugins/artwork/artwork.c
+++ b/plugins/artwork/artwork.c
@@ -655,7 +655,7 @@ artwork_on_configchanged (DB_event_t *ev, uintptr_t data) {
strcpy (artwork_filemask, new_artwork_filemask);
deadbeef->conf_set_int64 ("artwork.cache_reset_time", artwork_reset_time);
artwork_reset (0);
- deadbeef->sendmessage (M_PLAYLISTREFRESH, 0, 0, 0);
+ deadbeef->sendmessage (M_PLAYLIST_REFRESH, 0, 0, 0);
}
return 0;
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c
index 69192aac..91e0e129 100644
--- a/plugins/gtkui/callbacks.c
+++ b/plugins/gtkui/callbacks.c
@@ -274,7 +274,7 @@ void
on_stopbtn_clicked (GtkButton *button,
gpointer user_data)
{
- deadbeef->sendmessage (M_STOPSONG, 0, 0, 0);
+ deadbeef->sendmessage (M_STOP, 0, 0, 0);
}
@@ -282,7 +282,7 @@ void
on_playbtn_clicked (GtkButton *button,
gpointer user_data)
{
- deadbeef->sendmessage (M_PLAYSONG, 0, 0, 0);
+ deadbeef->sendmessage (M_PLAY_CURRENT, 0, 0, 0);
}
@@ -290,7 +290,7 @@ void
on_pausebtn_clicked (GtkButton *button,
gpointer user_data)
{
- deadbeef->sendmessage (M_PAUSESONG, 0, 0, 0);
+ deadbeef->sendmessage (M_TOGGLE_PAUSE, 0, 0, 0);
}
@@ -298,7 +298,7 @@ void
on_prevbtn_clicked (GtkButton *button,
gpointer user_data)
{
- deadbeef->sendmessage (M_PREVSONG, 0, 0, 0);
+ deadbeef->sendmessage (M_PREV, 0, 0, 0);
}
@@ -306,7 +306,7 @@ void
on_nextbtn_clicked (GtkButton *button,
gpointer user_data)
{
- deadbeef->sendmessage (M_NEXTSONG, 0, 0, 0);
+ deadbeef->sendmessage (M_NEXT, 0, 0, 0);
}
@@ -314,7 +314,7 @@ void
on_playrand_clicked (GtkButton *button,
gpointer user_data)
{
- deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0);
+ deadbeef->sendmessage (M_PLAY_RANDOM, 0, 0, 0);
}
gboolean
@@ -325,7 +325,7 @@ on_mainwin_key_press_event (GtkWidget *widget,
uint32_t maskedstate = (event->state &~ (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD5_MASK)) & 0xfff;
if ((maskedstate == GDK_MOD1_MASK || maskedstate == 0) && event->keyval == GDK_n) {
// button for that one is not in toolbar anymore, so handle it manually
- deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0);
+ deadbeef->sendmessage (M_PLAY_RANDOM, 0, 0, 0);
}
else if ((maskedstate == GDK_MOD1_MASK || maskedstate == 0) && event->keyval >= GDK_1 && event->keyval <= GDK_9) {
int pl = event->keyval - GDK_1;
@@ -346,7 +346,7 @@ on_order_linear_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
deadbeef->conf_set_int ("playback.order", PLAYBACK_ORDER_LINEAR);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
@@ -355,7 +355,7 @@ on_order_shuffle_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
deadbeef->conf_set_int ("playback.order", PLAYBACK_ORDER_SHUFFLE_TRACKS);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
void
@@ -363,7 +363,7 @@ on_order_shuffle_albums_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
deadbeef->conf_set_int ("playback.order", PLAYBACK_ORDER_SHUFFLE_ALBUMS);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
void
@@ -371,7 +371,7 @@ on_order_random_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
deadbeef->conf_set_int ("playback.order", PLAYBACK_ORDER_RANDOM);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
diff --git a/plugins/gtkui/fileman.c b/plugins/gtkui/fileman.c
index 3f58bb09..17511778 100644
--- a/plugins/gtkui/fileman.c
+++ b/plugins/gtkui/fileman.c
@@ -73,7 +73,7 @@ open_files_worker (void *data) {
extern GtkWidget *mainwin;
DdbListview *pl = DDB_LISTVIEW (lookup_widget (mainwin, "playlist"));
ddb_listview_set_cursor (pl, 0);
- deadbeef->sendmessage (M_PLAYSONG, 0, 1, 0);
+ deadbeef->sendmessage (M_PLAY_CURRENT, 0, 1, 0);
}
void
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index abd6a720..6a30ac54 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -316,7 +316,7 @@ on_trayicon_button_press_event (GtkWidget *widget,
mainwin_toggle_visible ();
}
else if (event->button == 2) {
- deadbeef->sendmessage (M_PAUSESONG, 0, 0, 0);
+ deadbeef->sendmessage (M_TOGGLE_PAUSE, 0, 0, 0);
}
return FALSE;
}
@@ -1069,7 +1069,7 @@ gtkui_set_progress_text_idle (gpointer data) {
gboolean
gtkui_progress_hide_idle (gpointer data) {
progress_hide ();
- deadbeef->sendmessage (M_PLAYLISTREFRESH, 0, 0, 0);
+ deadbeef->sendmessage (M_PLAYLIST_REFRESH, 0, 0, 0);
//playlist_refresh ();
return FALSE;
}
diff --git a/plugins/gtkui/mainplaylist.c b/plugins/gtkui/mainplaylist.c
index 2df3bd0e..85562f5b 100644
--- a/plugins/gtkui/mainplaylist.c
+++ b/plugins/gtkui/mainplaylist.c
@@ -143,7 +143,7 @@ main_col_sort (int col, int sort_order, void *user_data) {
deadbeef->pl_sort (PL_MAIN, c->id, c->format, sort_order-1);
}
void main_handle_doubleclick (DdbListview *listview, DdbListviewIter iter, int idx) {
- deadbeef->sendmessage (M_PLAYSONGNUM, 0, idx, 0);
+ deadbeef->sendmessage (M_PLAY_NUM, 0, idx, 0);
}
void main_selection_changed (DdbListviewIter it, int idx) {
diff --git a/plugins/gtkui/pluginconf.c b/plugins/gtkui/pluginconf.c
index 73d50fed..566c96b0 100644
--- a/plugins/gtkui/pluginconf.c
+++ b/plugins/gtkui/pluginconf.c
@@ -50,7 +50,7 @@ on_prop_browse_file (GtkButton *button, gpointer user_data) {
if (folder) {
deadbeef->conf_set_str ("filechooser.lastdir", folder);
g_free (folder);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
if (response == GTK_RESPONSE_OK) {
gchar *file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
@@ -181,7 +181,7 @@ static void apply_conf (GtkWidget *w, ddb_dialog_t *conf) {
break;
}
}
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
static void
diff --git a/plugins/gtkui/prefwin.c b/plugins/gtkui/prefwin.c
index bf84a8a9..430dbd8a 100644
--- a/plugins/gtkui/prefwin.c
+++ b/plugins/gtkui/prefwin.c
@@ -666,7 +666,7 @@ on_pref_soundcard_changed (GtkComboBox *combobox,
const char *soundcard = deadbeef->conf_get_str ("alsa_soundcard", "default");
if (strcmp (soundcard, alsa_device_names[active])) {
deadbeef->conf_set_str ("alsa_soundcard", alsa_device_names[active]);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
}
}
@@ -708,7 +708,7 @@ on_pref_dynsamplerate_clicked (GtkButton *button,
{
int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
deadbeef->conf_set_int ("playback.dynsamplerate", active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
@@ -718,7 +718,7 @@ on_pref_src_quality_changed (GtkComboBox *combobox,
{
int active = gtk_combo_box_get_active (combobox);
deadbeef->conf_set_int ("src_quality", active == -1 ? 2 : active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
@@ -728,7 +728,7 @@ on_pref_replaygain_mode_changed (GtkComboBox *combobox,
{
int active = gtk_combo_box_get_active (combobox);
deadbeef->conf_set_int ("replaygain_mode", active == -1 ? 0 : active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
void
@@ -737,7 +737,7 @@ on_pref_replaygain_scale_clicked (GtkButton *button,
{
int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
deadbeef->conf_set_int ("replaygain_scale", active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
@@ -747,7 +747,7 @@ on_pref_close_send_to_tray_clicked (GtkButton *button,
{
int active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
deadbeef->conf_set_int ("close_send_to_tray", active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
void
@@ -756,7 +756,7 @@ on_hide_tray_icon_toggled (GtkToggleButton *togglebutton,
{
int active = gtk_toggle_button_get_active (togglebutton);
deadbeef->conf_set_int ("gtkui.hide_tray_icon", active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
void
@@ -850,7 +850,7 @@ on_tabstrip_light_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.tabstrip_light", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
redraw_headers ();
tabstrip_redraw ();
@@ -866,7 +866,7 @@ on_tabstrip_mid_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.tabstrip_mid", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
redraw_headers ();
tabstrip_redraw ();
@@ -882,7 +882,7 @@ on_tabstrip_dark_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.tabstrip_dark", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
redraw_headers ();
tabstrip_redraw ();
@@ -897,7 +897,7 @@ on_tabstrip_base_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.tabstrip_base", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
redraw_headers ();
tabstrip_redraw ();
@@ -913,7 +913,7 @@ on_bar_foreground_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.bar_foreground", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
seekbar_redraw ();
volumebar_redraw ();
@@ -930,7 +930,7 @@ on_bar_background_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.bar_background", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
seekbar_redraw ();
volumebar_redraw ();
@@ -944,7 +944,7 @@ on_override_listview_colors_toggled (GtkToggleButton *togglebutton,
int active = gtk_toggle_button_get_active (togglebutton);
deadbeef->conf_set_int ("gtkui.override_listview_colors", active);
gtk_widget_set_sensitive (lookup_widget (prefwin, "listview_colors_group"), active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
prefwin_init_theme_colors ();
playlist_refresh ();
@@ -960,7 +960,7 @@ on_listview_even_row_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.listview_even_row", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
playlist_refresh ();
}
@@ -974,7 +974,7 @@ on_listview_odd_row_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.listview_odd_row", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
playlist_refresh ();
}
@@ -988,7 +988,7 @@ on_listview_selected_row_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.listview_selection", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
playlist_refresh ();
}
@@ -1002,7 +1002,7 @@ on_listview_text_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.listview_text", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
playlist_refresh ();
}
@@ -1017,7 +1017,7 @@ on_listview_selected_text_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.listview_selected_text", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
playlist_refresh ();
}
@@ -1031,7 +1031,7 @@ on_listview_cursor_color_set (GtkColorButton *colorbutton,
char str[100];
snprintf (str, sizeof (str), "%d %d %d", clr.red, clr.green, clr.blue);
deadbeef->conf_set_str ("gtkui.color.listview_cursor", str);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
playlist_refresh ();
}
@@ -1044,7 +1044,7 @@ on_override_bar_colors_toggled (GtkToggleButton *togglebutton,
int active = gtk_toggle_button_get_active (togglebutton);
deadbeef->conf_set_int ("gtkui.override_bar_colors", active);
gtk_widget_set_sensitive (lookup_widget (prefwin, "bar_colors_group"), active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
prefwin_init_theme_colors ();
seekbar_redraw ();
@@ -1059,7 +1059,7 @@ on_override_tabstrip_colors_toggled (GtkToggleButton *togglebutton,
int active = gtk_toggle_button_get_active (togglebutton);
deadbeef->conf_set_int ("gtkui.override_tabstrip_colors", active);
gtk_widget_set_sensitive (lookup_widget (prefwin, "tabstrip_colors_group"), active);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
gtkui_init_theme_colors ();
prefwin_init_theme_colors ();
redraw_headers ();
diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c
index ee096930..d69deee9 100644
--- a/plugins/gtkui/search.c
+++ b/plugins/gtkui/search.c
@@ -176,7 +176,7 @@ on_searchwin_key_press_event (GtkWidget *widget,
int row = deadbeef->pl_get_cursor (PL_SEARCH);
DB_playItem_t *it = deadbeef->pl_get_for_idx_and_iter (max (row, 0), PL_SEARCH);
if (it) {
- deadbeef->sendmessage (M_PLAYSONGNUM, 0, deadbeef->pl_get_idx_of (it), 0);
+ deadbeef->sendmessage (M_PLAY_NUM, 0, deadbeef->pl_get_idx_of (it), 0);
deadbeef->pl_item_unref (it);
}
}
@@ -364,7 +364,7 @@ void search_col_free_user_data (void *data) {
}
void search_handle_doubleclick (DdbListview *listview, DdbListviewIter iter, int idx) {
- deadbeef->sendmessage (M_PLAYSONGNUM, 0, deadbeef->pl_get_idx_of ((DB_playItem_t *)iter), 0);
+ deadbeef->sendmessage (M_PLAY_NUM, 0, deadbeef->pl_get_idx_of ((DB_playItem_t *)iter), 0);
}
void search_selection_changed (DdbListviewIter it, int idx) {
diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c
index 906fb74c..26e6a864 100644
--- a/plugins/hotkeys/hotkeys.c
+++ b/plugins/hotkeys/hotkeys.c
@@ -111,7 +111,7 @@ cmd_stop_after_current (void *unused) {
int var = deadbeef->conf_get_int ("playlist.stop_after_current", 0);
var = 1 - var;
deadbeef->conf_set_int ("playlist.stop_after_current", var);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
}
/*
@@ -583,7 +583,7 @@ action_toggle_stop_after_current_cb (struct DB_plugin_action_s *action, DB_playI
int var = deadbeef->conf_get_int ("playlist.stop_after_current", 0);
var = 1 - var;
deadbeef->conf_set_int ("playlist.stop_after_current", var);
- deadbeef->sendmessage (M_CONFIGCHANGED, 0, 0, 0);
+ deadbeef->sendmessage (M_CONFIG_CHANGED, 0, 0, 0);
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 08:23:02 +0000