X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Finstance.h;h=6dae17952172bf11bb51f623b11748b94000e458;hb=HEAD;hp=8cd0378747b578b16e6388dac721ea1359b424ff;hpb=888b62e244add3b4b495427cd3e789b9e4dca70e;p=melted_gui

diff --git a/src/instance.h b/src/instance.h
index 8cd0378..6dae179 100644
--- a/src/instance.h
+++ b/src/instance.h
@@ -98,18 +98,25 @@ typedef enum playlist_item_type
 #define PLAYLIST_ITEM_ERROR_LIB 1
 #define PLAYLIST_ITEM_ERROR_CUE 2
 
+/**
+ * @anchor playlist_item_t
+ *
+ * fu
+ */
 typedef struct playlist_item
 {
-    char id[PATH_MAX];
-    char title[PATH_MAX];
+/*@{*/
+    char id[PATH_MAX];          /**< id of item, i.e. internal id or filename */
+    char title[PATH_MAX];       /**< title */
     int in;
     int dur;
-    int player;
-    playlist_item_type_t type;
-    int omn_idx;
-    int omn_offset;
-    int error;
-    int del;
+    int player;                 /**< player index that item currenly associated, -1 otherwise */
+    playlist_item_type_t type;  /**< block type of item */
+    int int_idx;                /**< internal playlist index */
+//    int omn_offset;
+    int error;                  /**< flag indicates if any error occured with item */
+    int del;                    /**<  */
+/*@}*/
 } playlist_item_t;
 
 #define MAX_PLAYERS 4
@@ -119,7 +126,6 @@ struct instance_desc;
 typedef struct player_desc
 {
     int idx;
-//    char name[PATH_MAX];
     int unit;
     void* handle;
     GThread* thread;
@@ -133,7 +139,7 @@ typedef struct instance_desc
 {
     GtkWidget *window;
     GtkWidget *playlist_grid;
-    GtkWidget *library_grid;
+    GtkWidget *library_tree;
     GtkWidget *buttons[BUTTON_LAST + 1];
     GtkWidget *status_label;
     struct
@@ -141,6 +147,7 @@ typedef struct instance_desc
         player_t item[MAX_PLAYERS];
         int count;
         char host[PATH_MAX];
+        int port;
         pthread_mutex_t lock;
     } players;
     int f_exit;
@@ -156,6 +163,11 @@ typedef struct instance_desc
     } playlist;
     struct
     {
+        int port;
+        void* handle[2];
+        GdkPixbuf *icons[8];
+
+
         playlist_item_t item[MAX_LIBRARY_ITEMS];
         int count;
         char filename[PATH_MAX];