fixed link errors in gtkui

4 files changed, 17 insertions, 11 deletions

diff --git a/plugins/gtkui/gtkplaylist.c b/plugins/gtkui/gtkplaylist.c
index e4d90441..b7c4cfec 100644
--- a/plugins/gtkui/gtkplaylist.c
+++ b/plugins/gtkui/gtkplaylist.c
@@ -1017,6 +1017,7 @@ gtkpl_keypress (gtkplaylist_t *ps, int keyval, int state) {
             newscroll = deadbeef->pl_get_cursor (ps->iterator) - widget->allocation.height / rowheight + 1;
         }
     }
+#if 0
     else if (keyval == GDK_r) {
         extern int replaygain;
         replaygain = 1-replaygain;
@@ -1027,6 +1028,7 @@ gtkpl_keypress (gtkplaylist_t *ps, int keyval, int state) {
         replaygain_scale = 1-replaygain_scale;
         fprintf (stderr, "replaygain_scale=%d\n", replaygain_scale);
     }
+#endif
     else if (keyval == GDK_Up && deadbeef->pl_get_cursor (ps->iterator) > 0) {
         deadbeef->pl_set_cursor (ps->iterator, deadbeef->pl_get_cursor (ps->iterator) - 1);
         if (deadbeef->pl_get_cursor (ps->iterator) < ps->scrollpos) {
diff --git a/plugins/gtkui/gtkplaylist.h b/plugins/gtkui/gtkplaylist.h
index 202c8f65..3d7c956e 100644
--- a/plugins/gtkui/gtkplaylist.h
+++ b/plugins/gtkui/gtkplaylist.h
@@ -179,9 +179,9 @@ gtkpl_get_idx_of (gtkplaylist_t *ps, DB_playItem_t *it);
 DB_playItem_t *
 gtkpl_get_for_idx (gtkplaylist_t *ps, int idx);
 
-// this functions take value from passed playlist, that's why it's here
-void
-gtkpl_playsong (gtkplaylist_t *ps);
+//// this functions take value from passed playlist, that's why it's here
+//void
+//gtkpl_playsong (gtkplaylist_t *ps);
 
 void
 gtkpl_songchanged (gtkplaylist_t *ps, int from, int to);
diff --git a/plugins/gtkui/gtksession.c b/plugins/gtkui/gtksession.c
index e24706b6..1c67a925 100644
--- a/plugins/gtkui/gtksession.c
+++ b/plugins/gtkui/gtksession.c
@@ -22,7 +22,9 @@
 #  include <config.h>
 #endif
 #include "session.h"
-#include "conf.h"
+#include "deadbeef.h"
+
+extern DB_functions_t *deadbeef; // defined in gtkui.c
 
 void
 session_capture_window_attrs (uintptr_t window) {
@@ -30,15 +32,15 @@ session_capture_window_attrs (uintptr_t window) {
     int win_attrs[4];
     gtk_window_get_position (wnd, &win_attrs[0], &win_attrs[1]);
     gtk_window_get_size (wnd, &win_attrs[2], &win_attrs[3]);
-    conf_set_int ("mainwin.geometry.x", win_attrs[0]);
-    conf_set_int ("mainwin.geometry.y", win_attrs[1]);
-    conf_set_int ("mainwin.geometry.w", win_attrs[2]);
-    conf_set_int ("mainwin.geometry.h", win_attrs[3]);
+    deadbeef->conf_set_int ("mainwin.geometry.x", win_attrs[0]);
+    deadbeef->conf_set_int ("mainwin.geometry.y", win_attrs[1]);
+    deadbeef->conf_set_int ("mainwin.geometry.w", win_attrs[2]);
+    deadbeef->conf_set_int ("mainwin.geometry.h", win_attrs[3]);
 }
 
 void
 session_restore_window_attrs (uintptr_t window) {
     GtkWindow *wnd = GTK_WINDOW (window);
-    gtk_window_move (wnd, conf_get_int ("mainwin.geometry.x", 40), conf_get_int ("mainwin.geometry.y", 40));
-    gtk_window_resize (wnd, conf_get_int ("mainwin.geometry.w", 500), conf_get_int ("mainwin.geometry.h", 300));
+    gtk_window_move (wnd, deadbeef->conf_get_int ("mainwin.geometry.x", 40), deadbeef->conf_get_int ("mainwin.geometry.y", 40));
+    gtk_window_resize (wnd, deadbeef->conf_get_int ("mainwin.geometry.w", 500), deadbeef->conf_get_int ("mainwin.geometry.h", 300));
 }
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 5c5de187..3d6a9b09 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -225,12 +225,14 @@ guiplug_showwindow (void) {
     GDK_THREADS_LEAVE();
 }
 
+#if 0
 void
 guiplug_play_current_song (void) {
     GDK_THREADS_ENTER();
     gtkpl_playsong (&main_playlist);
     GDK_THREADS_LEAVE();
 }
+#endif
 
 void
 guiplug_shutdown (void) {
@@ -291,7 +293,7 @@ guiplug_add_files (GSList *files) {
 void
 guiplug_open_files (GSList *files) {
     gtkpl_add_files (&main_playlist, files);
-    gtkpl_playsong (&main_playlist);
+    //gtkpl_playsong (&main_playlist);
 }
 
 void