From e8f2cb22a3d51b9156ac399c0f3d45a713074bb6 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <waker@users.sourceforge.net>
Date: Sun, 17 Nov 2013 16:55:17 +0100
Subject: gtkui: fixed refresh after loading playlist

---
 deadbeef.h                     | 2 +-
 plugins/gtkui/actionhandlers.c | 4 ++--
 plugins/gtkui/gtkui.c          | 8 +-------
 plugins/gtkui/gtkui.h          | 6 ------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/deadbeef.h b/deadbeef.h
index 2ed468cb..0a270421 100644
--- a/deadbeef.h
+++ b/deadbeef.h
@@ -526,7 +526,7 @@ typedef struct {
     void (*plt_move) (int from, int before);
 
     // playlist saving and loading
-    DB_playItem_t * (*plt_load) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
+    DB_playItem_t * (*plt_load) (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) DEPRECATED_15;
     int (*plt_save) (ddb_playlist_t *plt, DB_playItem_t *first, DB_playItem_t *last, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data);
 
     ddb_playlist_t *(*plt_get_for_idx) (int idx);
diff --git a/plugins/gtkui/actionhandlers.c b/plugins/gtkui/actionhandlers.c
index 88214a1c..b2923c2e 100644
--- a/plugins/gtkui/actionhandlers.c
+++ b/plugins/gtkui/actionhandlers.c
@@ -656,7 +656,7 @@ load_playlist_thread (void *data) {
     if (plt) {
         deadbeef->plt_clear (plt);
         int abort = 0;
-        DB_playItem_t *it = deadbeef->plt_load (plt, NULL, fname, &abort, NULL, NULL);
+        DB_playItem_t *it = deadbeef->plt_load2 (0, plt, NULL, fname, &abort, NULL, NULL);
         if (it) {
             deadbeef->pl_item_unref (it);
         }
@@ -664,7 +664,7 @@ load_playlist_thread (void *data) {
         deadbeef->plt_unref (plt);
     }
     g_free (fname);
-    gtkui_playlist_changed ();
+    deadbeef->sendmessage (DB_EV_PLAYLISTCHANGED, 0, 0, 0);
 }
 
 
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 27d4d650..dc6eeb1f 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -492,11 +492,6 @@ playlistchanged_cb (gpointer none) {
     return FALSE;
 }
 
-void
-gtkui_playlist_changed (void) {
-    g_idle_add (playlistchanged_cb, NULL);
-}
-
 static gboolean
 playlistswitch_cb (gpointer none) {
     search_refresh ();
@@ -829,7 +824,7 @@ gtkui_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
 //        g_idle_add (paused_cb, NULL);
 //        break;
     case DB_EV_PLAYLISTCHANGED:
-        gtkui_playlist_changed ();
+        g_idle_add (playlistchanged_cb, NULL);
         break;
     case DB_EV_VOLUMECHANGED:
         g_idle_add (gtkui_volumechanged_cb, NULL);
@@ -906,7 +901,6 @@ gtkui_connect_cb (void *none) {
             break;
         }
     }
-    gtkui_playlist_changed ();
     add_mainmenu_actions ();
     ddb_event_t *e = deadbeef->event_alloc (DB_EV_TRACKINFOCHANGED);
     deadbeef->event_send(e, 0, 0);
diff --git a/plugins/gtkui/gtkui.h b/plugins/gtkui/gtkui.h
index 34e639a4..abd71af7 100644
--- a/plugins/gtkui/gtkui.h
+++ b/plugins/gtkui/gtkui.h
@@ -114,12 +114,6 @@ on_seekbar_motion_notify_event         (GtkWidget       *widget,
 void
 volumebar_redraw (void);
 
-//void
-//tabstrip_redraw (void);
-
-void
-gtkui_playlist_changed (void);
-
 void
 gtkui_set_titlebar (DB_playItem_t *it);
 
-- 
cgit v1.2.3