X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fomnplay.h;h=638247e1306aec6c733fbeeaf123d2a04577be9e;hb=df482032dda64bf46dd2913318767257956d2ba0;hp=d336ed631df809949932dd4a529f2b19af15099b;hpb=be35f211e1af32ce8940db1f10e2fb283bf1fe0a;p=melted_gui diff --git a/src/omnplay.h b/src/omnplay.h index d336ed6..638247e 100644 --- a/src/omnplay.h +++ b/src/omnplay.h @@ -20,6 +20,8 @@ #ifndef OMNPLAY_H #define OMNPLAY_H +#include + #ifdef __cplusplus extern "C" { @@ -103,6 +105,7 @@ typedef struct playlist_item int omn_idx; int omn_offset; int error; + int del; } playlist_item_t; #define MAX_PLAYERS 4 @@ -115,7 +118,7 @@ typedef struct omnplay_player char name[PATH_MAX]; char host[PATH_MAX]; void* handle; - pthread_t thread; + GThread* thread; GtkWidget *label_status, *label_state, *label_tc_cur, *label_tc_rem, *label_clip; struct omnplay_instance *app; int playlist_start; @@ -128,6 +131,7 @@ typedef struct omnplay_instance GtkWidget *playlist_grid; GtkWidget *library_grid; GtkWidget *buttons[BUTTON_LAST + 1]; + GtkWidget *status_label; struct { omnplay_player_t item[MAX_PLAYERS]; @@ -153,10 +157,14 @@ typedef struct omnplay_instance char filename[PATH_MAX]; char whois[PATH_MAX]; pthread_mutex_t lock; - pthread_t refresh_thread; - GtkWidget *refresh_ui[2]; + GThread* refresh_thread; GtkWidget *search; } library; + struct + { + playlist_item_t item[MAX_LIBRARY_ITEMS]; + int count; + } clipboard; } omnplay_instance_t; omnplay_instance_t* omnplay_create(int argc, char** argv); @@ -182,6 +190,7 @@ int omnplay_library_normalize_item(omnplay_instance_t* app, playlist_item_t* ite playlist_item_t* omnplay_library_get_selected(omnplay_instance_t* app, int *count); void omnplay_playlist_normalize(omnplay_instance_t* app); void omnplay_library_search(omnplay_instance_t* app, int next); +void omnplay_set_status(omnplay_instance_t* app, char* str); #ifdef __cplusplus };