static int find_index_of_playlist_item(omnplay_instance_t* app, int start, int idx)
{
+ if(start < 0 || start >= app->playlist.count)
+ return -1;
+
while(1)
{
if(app->playlist.item[start].omn_idx == idx)
g_warning("omnplay_thread_proc\n");
+ memset(&st_curr, 0, sizeof(OmPlrStatus));
+ memset(&st_prev, 0, sizeof(OmPlrStatus));
+
/* connect */
pthread_mutex_lock(&player->app->players.lock);
r = OmPlrOpen(player->host, player->name, (OmPlrHandle*)&player->handle);
return TRUE;
};
break;
+ case GDK_KEY_uparrow:
+ if(event->state & GDK_CONTROL_MASK)
+ {
+ omnplay_playlist_item_swap(app, -1);
+ return TRUE;
+ };
+ break;
+ case GDK_KEY_downarrow:
+ if(event->state & GDK_CONTROL_MASK)
+ {
+ omnplay_playlist_item_swap(app, -1);
+ return TRUE;
+ };
+ break;
case GDK_KEY_space:
omnplay_ctl(app, BUTTON_PLAYER_PLAY);
return TRUE;
case GDK_KEY_Delete:
omnplay_playlist_item_del(app);
return TRUE;
- case GDK_KEY_BackSpace:
+ case GDK_E:
+ case GDK_e:
omnplay_playlist_item_edit(app);
return TRUE;
};
return TRUE;
};
break;
+ case GDK_KEY_BackSpace:
+ omnplay_library_add(app, 0);
+ return TRUE;
+ case GDK_KEY_F5:
+ omnplay_library_refresh(app);
+ return TRUE;
};
return FALSE;
return FALSE;
};
+
+
+static void library_grid_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context,
+ GtkSelectionData *selection_data, guint info, guint time, gpointer userdata)
+{
+ int c;
+ playlist_item_t* items;
+ omnplay_instance_t* app = (omnplay_instance_t*)userdata;
+
+ g_warning("library_grid_drag_data_get_cb");
+
+ items = omnplay_library_get_selected(app, &c);
+
+ /* clear item */
+ if(items)
+ {
+ gtk_selection_data_set(selection_data, selection_data->target, 8,
+ (const guchar *)items, sizeof(playlist_item_t) * c);
+ free(items);
+ };
+};
+
+static void playlist_grid_drag_data_get_cb(GtkWidget *widget, GdkDragContext *context,
+ GtkSelectionData *selection_data, guint info, guint time, gpointer userdata)
+{
+ int *list, i;
+ playlist_item_t* items;
+ omnplay_instance_t* app = (omnplay_instance_t*)userdata;
+
+ list = get_selected_items_playlist(app);
+ if(!list) return;
+
+ items = (playlist_item_t*)malloc(sizeof(playlist_item_t) * list[0]);
+ for(i = 0; i < list[0]; i++)
+ items[i] = app->playlist.item[list[i + 1]];
+ gtk_selection_data_set(selection_data, selection_data->target, 8,
+ (const guchar *)items, sizeof(playlist_item_t) * list[0]);
+
+ free(items);
+ free(list);
+};
+
+static void library_grid_drag_begin_cb(GtkWidget *widget, GdkDragContext *context, gpointer userdata)
+{
+ g_warning("library_grid_drag_begin_cb");
+ gtk_drag_source_set_icon_stock(widget, GTK_STOCK_DND);
+};
+
+static void playlist_grid_drag_begin_cb(GtkWidget *widget, GdkDragContext *context, gpointer userdata)
+{
+ g_warning("playlist_grid_drag_begin_cb");
+ gtk_drag_source_set_icon_stock(widget, GTK_STOCK_DND);
+};
+
+static void playlist_grid_drag_data_received(GtkWidget *widget, GdkDragContext *context,
+ gint x, gint y, GtkSelectionData *selection_data, guint info, guint time, gpointer userdata)
+{
+ int c, i, idx;
+ playlist_item_type_t t;
+ playlist_item_t* items;
+ GtkTreePath *path = NULL;
+ omnplay_instance_t* app = (omnplay_instance_t*)userdata;
+
+ g_warning("playlist_grid_drag_data_received");
+
+ items = (playlist_item_t*)gtk_selection_data_get_data(selection_data);
+ c = gtk_selection_data_get_length(selection_data);
+
+ if(c % sizeof(playlist_item_t))
+ {
+ g_warning("playlist_grid_drag_data_received: ODD ITEMS");
+ }
+ else
+ {
+ c /= sizeof(playlist_item_t);
+
+ if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), x, y, &path, NULL, NULL, NULL))
+ {
+ idx = gtk_tree_path_get_indices(path)[0];
+ gtk_tree_path_free(path);
+
+ g_warning("playlist_grid_drag_data_received: gtk_tree_path_get_indice[0]=%d", idx);
+
+ /* normalize, FIX ME */
+ idx--; if(idx < 0) idx = 0;
+ }
+ else
+ idx = app->playlist.count;
+
+ g_warning("playlist_grid_drag_data_received: idx=%d", idx);
+
+ if(omnplay_playlist_insert_check(app, idx, &t))
+ {
+ for(i = 0; i < c; i++)
+ {
+ items[i].type = t;
+ items[i].error = 0;
+ };
+ omnplay_playlist_insert_items(app, idx, items, c);
+ };
+ };
+
+ /* Finish the drag */
+ gtk_drag_finish(context, TRUE, FALSE, time);
+};
+
+
void omnplay_init(omnplay_instance_t* app)
{
int i;
/* create lock */
pthread_mutex_init(&app->players.lock, &attr);
+ pthread_mutex_init(&app->playlist.lock, &attr);
+ pthread_mutex_init(&app->library.lock, &attr);
/* create a omneon status thread */
for(i = 0; i < app->players.count; i++)
- pthread_create(&app->players.item[i].thread, NULL,
- omnplay_thread_proc, &app->players.item[i]);
-
-
- /* create lock */
- pthread_mutex_init(&app->playlist.lock, &attr);
+ app->players.item[i].thread = g_thread_create(
+ omnplay_thread_proc, &app->players.item[i], TRUE, NULL);
/* attach buttons click */
for(i = 1; i < BUTTON_LAST; i++)
gtk_signal_connect(GTK_OBJECT(app->buttons[i]), "clicked",
GTK_SIGNAL_FUNC( on_button_click), app );
- /* create lock */
- pthread_mutex_init(&app->library.lock, &attr);
-
/* load library */
omnplay_library_load(app);
pthread_mutexattr_destroy(&attr);
+
+ /* setup drag n drop source/target */
+ static GtkTargetEntry drag_targets[] = { { (char*) "application/playlist_item_t", 0, 0 } };
+
+ gtk_drag_source_set(app->library_grid, GDK_BUTTON1_MASK,
+ drag_targets, 1, (GdkDragAction)(GDK_ACTION_COPY));
+
+ gtk_drag_source_set(app->playlist_grid, GDK_BUTTON1_MASK,
+ drag_targets, 1, (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE));
+
+ gtk_drag_dest_set(app->playlist_grid, GTK_DEST_DEFAULT_ALL,
+ drag_targets, 1, (GdkDragAction)(GDK_ACTION_COPY | GDK_ACTION_MOVE));
+
+ g_signal_connect (app->library_grid, "drag_data_get", G_CALLBACK(library_grid_drag_data_get_cb), app);
+ g_signal_connect (app->playlist_grid, "drag_data_get", G_CALLBACK(playlist_grid_drag_data_get_cb), app);
+ g_signal_connect (app->library_grid, "drag_begin", G_CALLBACK(library_grid_drag_begin_cb), app);
+ g_signal_connect (app->playlist_grid, "drag_begin", G_CALLBACK(playlist_grid_drag_begin_cb), app);
+ g_signal_connect (app->playlist_grid, "drag_data_received", G_CALLBACK (playlist_grid_drag_data_received), app);
};
void omnplay_release(omnplay_instance_t* app)
{
int i;
- void* r;
app->f_exit = 1;
for(i = 0; i < app->players.count; i++)
/* create a omneon status thread */
- pthread_join(app->players.item[i].thread, &r);
+ g_thread_join(app->players.item[i].thread);
/* destroy lock */
pthread_mutex_destroy(&app->players.lock);
if(omnplay_library_normalize_item(app, &app->playlist.item[i]))
omnplay_playlist_draw_item(app, i);
};
+
+void omnplay_set_status(omnplay_instance_t* app, char* str)
+{
+ gdk_threads_enter();
+ gtk_label_set_text(GTK_LABEL(app->status_label), str);
+ gdk_flush();
+ gdk_threads_leave();
+};
+