fix root dir type

[melted_gui] / src / instance.c

diff --git a/src/instance.c b/src/instance.c
index 20066dd..df64987 100644 (file)
--- a/src/instance.c
+++ b/src/instance.c
@@ -32,6 +32,10 @@
 #include <gdk/gdkkeysyms.h>
 #include <pthread.h>
 
+#if defined(__MINGW32__)
+#include <winsock2.h>
+#endif
+
 #include "instance.h"
 #include "ui.h"
 #include "opts.h"
@@ -39,6 +43,7 @@
 #include "player.h"
 #include "library.h"
 #include "playlist.h"
+#include "control.h"
 
 GtkTargetEntry drag_targets[] = { { (char*) "application/playlist_item_t", 0, 0 } };
 
@@ -132,7 +137,7 @@ static gboolean playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpointe
         case GDK_s:
             if(event->state & GDK_CONTROL_MASK)
             {
-//                omnplay_playlist_save(app);
+                playlist_save(app);
                 return TRUE;
             };
             break;
@@ -140,7 +145,7 @@ static gboolean playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpointe
         case GDK_o:
             if(event->state & GDK_CONTROL_MASK)
             {
-//                omnplay_playlist_load(app);
+                playlist_load(app);
                 return TRUE;
             };
             break;
@@ -159,10 +164,10 @@ static gboolean playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpointe
             };
             break;
         case GDK_KEY_space:
-//            omnplay_ctl(app, BUTTON_PLAYER_PLAY);
+            control_route(app, BUTTON_PLAYER_PLAY);
             return TRUE;
         case GDK_KEY_Return:
-//            omnplay_ctl(app, BUTTON_PLAYER_CUE);
+            control_route(app, BUTTON_PLAYER_CUE);
             return TRUE;
         case GDK_KEY_Insert:
 //            omnplay_playlist_item_add(app, 0);
@@ -172,7 +177,7 @@ static gboolean playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpointe
             return TRUE;
         case GDK_E:
         case GDK_e:
-//            omnplay_playlist_item_edit(app);
+            playlist_item_edit(app);
             return TRUE;
     };
 
@@ -185,7 +190,7 @@ static gboolean library_tree_button(GtkWidget *widget, GdkEventButton *event, gp
 
     if(event->button==1 && event->type==GDK_2BUTTON_PRESS)
     {
-//        omnplay_library_add((omnplay_instance_t* )data, 0);
+        playlist_item_add_from_library((instance_t* )data, 0);
         return TRUE;
     };
 
@@ -200,7 +205,7 @@ static gboolean playlist_grid_button(GtkWidget *widget, GdkEventButton *event, g
 
     if(event->button==1 && event->type==GDK_2BUTTON_PRESS)
     {
-//        omnplay_playlist_item_edit(app);
+        playlist_item_edit(app);
         return TRUE;
     };
 
@@ -240,10 +245,9 @@ static gboolean instance_button_click(instance_t* app, control_buttons_t button)
         case BUTTON_PLAYER_PLAY:
         case BUTTON_PLAYER_PAUSE:
         case BUTTON_PLAYER_STOP:
-//            omnplay_ctl(app, button);
+            control_route(app, button);
             break;
         case BUTTON_LIBRARY_ADD:
-//            omnplay_library_add(app, 0);
             playlist_item_add_from_library(app, 0);
             break;
         case BUTTON_LIBRARY_REFRESH:
@@ -321,6 +325,13 @@ void instance_init(instance_t* app)
     int i;
     pthread_mutexattr_t attr;
 
+#if defined(__MINGW32__)
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    wVersionRequested = MAKEWORD(2, 2);
+    WSAStartup(wVersionRequested, &wsaData);
+#endif
+
     gtk_signal_connect( GTK_OBJECT( app->window ), "delete-event",
         GTK_SIGNAL_FUNC(on_main_window_delete_event), app);