X-Git-Url: https://develop.uap-core.de/gitweb/uwplayer.git/blobdiff_plain/18d1fe7ac177615f5f8c0b2b736e535c516e2aa1..3c1675731caaac73d6c362075ffb82bc45d2f060:/application/window.c

diff --git a/application/window.c b/application/window.c
index f2c8091..1b351a8 100644
--- a/application/window.c
+++ b/application/window.c
@@ -27,6 +27,8 @@
 #include "window.h"
 #include "main.h"
 #include "player.h"
+#include "playlist.h"
+#include "xdnd.h"
 
 #include "Fsb.h"
 #include "Sidebar.h"
@@ -92,18 +94,16 @@ static void resizeEH(Widget widget, XtPointer data, XEvent *event, Boolean *disp
 static void WindowRealized(MainWindow *win) {
     char *open_file = GetOpenFileArg();
     if(open_file) {
-        size_t len = strlen(open_file);
-        char *file = XtMalloc(len+1);
-        memcpy(file, open_file, len);
-        file[len] = 0;
-        WindowSetFile(win, file);
-        PlayerOpenFile(win);
+        PlayListAddFile(win, open_file);
+        PlayListPlayNext(win, true);
         CleanOpenFileArg();
     }
     
     if(!blank_cursor_init) {
         init_blank_cursor(win->player_widget);
     }
+    
+    XdndEnable(win->window);
 }
 
 static void playerWidgetInputCB(Widget widget, XtPointer u, XtPointer c) {
@@ -248,6 +248,8 @@ void WindowHandlePlayerEvent(MainWindow *win, XEvent *event) {
     }
 }
 
+
+
 MainWindow* WindowCreate(Display *display) {
     Arg args[32];
     int n;
@@ -255,7 +257,7 @@ MainWindow* WindowCreate(Display *display) {
     MainWindow *window = malloc(sizeof(MainWindow));
     memset(window, 0, sizeof(MainWindow));
     main_window = window;
-    
+      
     // toplevel window
     n = 0;
     XtSetArg(args[n], XmNtitle, APP_NAME); n++;
@@ -304,8 +306,9 @@ MainWindow* WindowCreate(Display *display) {
     XtSetArg(args[n], XmNtopWidget, window->menubar); n++;
     XtSetArg(args[n], XmNwidth, 300); n++;
     window->sidebar = CreateSidebar(container, "sidebar", args, n);
+    SidebarSetWindow(window->sidebar, window);
     //XtManageChild(window->sidebar);
-    
+       
     n = 0;
     XtSetArg(args[n], XmNleftAttachment, XmATTACH_FORM); n++;
     XtSetArg(args[n], XmNrightAttachment, XmATTACH_FORM); n++;
@@ -326,6 +329,9 @@ MainWindow* WindowCreate(Display *display) {
     // get F keycode
     keycodeF = XKeysymToKeycode(XtDisplay(window->window), XStringToKeysym("F"));
     
+    
+    PlayListInit(window);
+    
     return window;
 }
 
@@ -533,13 +539,6 @@ void WindowMenubarSetVisible(MainWindow *win, bool visible) {
     }
 }
 
-void WindowSetFile(MainWindow *win, char *file) {
-    if(win->file) {
-        XtFree(win->file);
-    }
-    win->file = file;
-}
-
 static void filedialog_end(
         Widget widget,
         MainWindow *data,
@@ -558,10 +557,9 @@ static void filedialog_select(
     if(selection->value) {
         XmStringGetLtoR(selection->value, XmSTRING_DEFAULT_CHARSET, &value);
         if(value) {
-            WindowSetFile(data, value);
-            // no need to free the value, because it is stored in MainWindow
-            
-            PlayerOpenFile(data);
+            PlayListAddFile(data, value);
+            PlayListPlayNext(data, true);
+            XtFree(value);
         }
     }
     filedialog_end(widget, data, NULL);
@@ -594,27 +592,27 @@ static void FileQuitCB(Widget w, void *udata, void *cdata) {
 
 static void PlayRepeatCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
-    win->repeatTrack = XmToggleButtonGadgetGetState(w);
-    win->repeatList = 0;
-    win->autoplayFolder = 0;
+    win->playlist.repeatTrack = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatList = 0;
+    win->playlist.autoplayFolder = 0;
     XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
     XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
 }
 
 static void PlayRepeatListCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
-    win->repeatList = XmToggleButtonGadgetGetState(w);
-    win->repeatTrack = 0;
-    win->autoplayFolder = 0;
+    win->playlist.repeatList = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatTrack = 0;
+    win->playlist.autoplayFolder = 0;
     XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
     XtVaSetValues(win->playAutoPlayButton, XmNset, 0, NULL);
 }
 
 static void PlayAutoPlayCB(Widget w, void *udata, void *cdata) {
     MainWindow *win = udata;
-    win->autoplayFolder = XmToggleButtonGadgetGetState(w);
-    win->repeatTrack = 0;
-    win->repeatList = 0;
+    win->playlist.autoplayFolder = XmToggleButtonGadgetGetState(w);
+    win->playlist.repeatTrack = 0;
+    win->playlist.repeatList = 0;
     XtVaSetValues(win->playRepeatTrackButton, XmNset, 0, NULL);
     XtVaSetValues(win->playRepeatListButton, XmNset, 0, NULL);
 }
@@ -700,3 +698,6 @@ void WindowShowSidebar(MainWindow *win) {
     XtVaSetValues(win->player_widget, XmNrightAttachment, XmATTACH_WIDGET, XmNrightWidget, win->sidebar, NULL);
 }
 
+void WindowUpdate(MainWindow *win) {
+    SidebarRepaint(win->sidebar);
+}