ucx update

[uwplayer.git] / application / window.h

diff --git a/application/window.h b/application/window.h
index 617ff71..deb8fe8 100644 (file)
--- a/application/window.h
+++ b/application/window.h
@@ -27,7 +27,8 @@
 #include <Xm/XmAll.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <ucx/list.h>
+#include <cx/list.h>
+#include <cx/linked_list.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,18 +50,20 @@ typedef struct Player {
 } Player;
 
 typedef struct {
-    UcxList *tracks;
+    CxList *tracks;
     int current_track;
     
     Boolean repeatTrack;
     Boolean repeatList;
     Boolean autoplayFolder;
+    Boolean random;
 } PlayList;
 
 typedef struct MainWindow {
     Widget window;
     Widget menubar;
     Widget player_widget;
+    Widget sidebar_scrolledwindow;
     Widget sidebar;
     char *file;
     Player *player;
@@ -74,10 +77,14 @@ typedef struct MainWindow {
     Widget playRepeatTrackButton;
     Widget playRepeatListButton;
     Widget playAutoPlayButton;
+    Widget playRandom;
     Widget viewSidebarButton;
+    Widget viewAdjustWindowSize;
     
     PlayList playlist;
     
+    bool adjustWindowSize;
+    
     Time player_event_time;
     Time button_press_time;
     double motion_playback_time;
@@ -106,8 +113,9 @@ void WindowShowPlayerCursor(MainWindow *win);
 
 void WindowHandlePlayerEvent(MainWindow *win, XEvent *event);
 
-void WindowHideSidebar(MainWindow *win);
-void WindowShowSidebar(MainWindow *win);
+void WindowShowSidebar(MainWindow *win, bool visible);
+
+void WindowUpdate(MainWindow *win);
 
 
 #ifdef __cplusplus