return list;
};
+static int idx_in_players_range(omnplay_instance_t* app, int idx)
+{
+ int i, r = 0;
+
+ for(i = 0; i < app->players.count && !r; i++)
+ {
+ int a, b;
+
+ a = app->players.item[i].playlist_start;
+ b = app->players.item[i].playlist_length;
+
+ if(b <= 0)
+ continue;
+
+ b = a + b - 1;
+
+ if(idx >= a && idx <= b) r = 1;
+ };
+
+ return r;
+};
+
+static int idxs_in_players_range(omnplay_instance_t* app, int start, int stop)
+{
+ int i, r = 0;
+
+ for(i = 0; i < app->players.count && !r; i++)
+ {
+ int a, b;
+
+ a = app->players.item[i].playlist_start;
+ b = app->players.item[i].playlist_length;
+
+ if(b <= 0)
+ continue;
+
+ b = a + b - 1;
+
+#define IN_RANGE(A,B,C) (A <= C && C <= B)
+ if( IN_RANGE(a,b,start) ||
+ IN_RANGE(a,b,stop) ||
+ IN_RANGE(start,stop,a) ||
+ IN_RANGE(start,stop,b))
+ r = 1;
+ };
+
+ return r;
+};
+
+static void omnplay_playlist_block(omnplay_instance_t* app, control_buttons_t button)
+{
+ int start, stop, r, i;
+ int* list = get_selected_items_playlist(app);
+
+ if(!list)
+ return;
+
+ pthread_mutex_lock(&app->playlist.lock);
+ pthread_mutex_lock(&app->players.lock);
+
+ start = list[1];
+ stop = list[list[0]];
+
+ if(!idxs_in_players_range(app, start, stop))
+ {
+ int loop = (button == BUTTON_PLAYLIST_BLOCK_LOOP)?OMNPLAY_PLAYLIST_BLOCK_LOOP:0;
+
+ /* update selected item */
+ for(i = start; i <= stop; i++)
+ {
+ int t = OMNPLAY_PLAYLIST_BLOCK_BODY | loop;
+
+ if(i == start) t |= OMNPLAY_PLAYLIST_BLOCK_BEGIN;
+ if(i == stop) t |= OMNPLAY_PLAYLIST_BLOCK_END;
+
+ app->playlist.item[i].type = (playlist_item_type_t)t;
+
+ omnplay_playlist_draw_item(app, i);
+ };
+
+ /* update border items */
+ if(!start && !(app->playlist.item[start - 1].type & OMNPLAY_PLAYLIST_BLOCK_END))
+ {
+ app->playlist.item[start - 1].type = (playlist_item_type_t)(OMNPLAY_PLAYLIST_BLOCK_END
+ | app->playlist.item[start - 1].type);
+ omnplay_playlist_draw_item(app, start - 1);
+ };
+ if((stop + 1) < app->playlist.count && !(app->playlist.item[stop + 1].type & OMNPLAY_PLAYLIST_BLOCK_BEGIN))
+ {
+ app->playlist.item[stop + 1].type = (playlist_item_type_t)(OMNPLAY_PLAYLIST_BLOCK_BEGIN
+ | app->playlist.item[stop + 1].type);
+ omnplay_playlist_draw_item(app, stop + 1);
+ };
+ }
+ else
+ fprintf(stderr, "omnplay_playlist_block: range [%d %d] do OVERLAP player\n",
+ start, stop);
+
+ pthread_mutex_unlock(&app->players.lock);
+ pthread_mutex_unlock(&app->playlist.lock);
+
+ free(list);
+};
+
static int get_first_selected_item_playlist(omnplay_instance_t* app)
{
int idx;
return NULL;
};
+static void omnplay_playlist_item_del(omnplay_instance_t* app)
+{
+
+};
+
+static int omnplay_playlist_insert_check(omnplay_instance_t* app, int idx, playlist_item_type_t* t)
+{
+ *t = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE;
+
+ /* before or after playlist */
+ if(!idx || idx == app->playlist.count)
+ return 1;
+
+ /* check for block borders */
+ if( app->playlist.item[idx - 1].type & OMNPLAY_PLAYLIST_BLOCK_END &&
+ app->playlist.item[idx + 0].type & OMNPLAY_PLAYLIST_BLOCK_BEGIN)
+ return 1;
+
+ /* check for playing block */
+ if(idx_in_players_range(app, idx))
+ return 0;
+
+ if(app->playlist.item[idx].type & OMNPLAY_PLAYLIST_BLOCK_LOOP)
+ *t = OMNPLAY_PLAYLIST_ITEM_LOOP_BODY;
+ else
+ *t = OMNPLAY_PLAYLIST_ITEM_BLOCK_BODY;
+
+ return 1;
+};
+
+static void omnplay_playlist_insert_items(omnplay_instance_t* app, int idx,
+ playlist_item_t* items, int count)
+{
+ int i;
+ GtkTreePath* path;
+
+ pthread_mutex_lock(&app->playlist.lock);
+ pthread_mutex_lock(&app->players.lock);
+
+ /* shift playlist items */
+ memmove
+ (
+ &app->playlist.item[idx + count],
+ &app->playlist.item[idx],
+ (app->playlist.count - idx) * sizeof(playlist_item_t)
+ );
+
+ /* copy new items */
+ memcpy
+ (
+ &app->playlist.item[idx],
+ items,
+ count * sizeof(playlist_item_t)
+ );
+
+ /* increment servers indexes */
+ for(i = 0; i < app->players.count; i++)
+ if(app->players.item[i].playlist_start >= idx)
+ app->players.item[i].playlist_start += idx;
+
+ /* increment items count */
+ app->playlist.count += count;
+
+ /* redraw playlist */
+ omnplay_playlist_draw(app);
+
+ /* select */
+ path = gtk_tree_path_new_from_indices(idx + count, -1);
+ gtk_tree_selection_select_path(gtk_tree_view_get_selection(GTK_TREE_VIEW(app->playlist_grid)), path);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(app->playlist_grid), path, NULL, FALSE);
+ gtk_tree_path_free(path);
+
+ pthread_mutex_unlock(&app->players.lock);
+ pthread_mutex_unlock(&app->playlist.lock);
+};
+
+static void omnplay_playlist_item_add(omnplay_instance_t* app, int after)
+{
+ int idx;
+ playlist_item_t item;
+ playlist_item_type_t t;
+
+ /* find insert position */
+ idx = get_first_selected_item_playlist(app);
+ if(idx < 0)
+ idx = 0;
+ else
+ idx += (after)?1:0;
+
+ if(!omnplay_playlist_insert_check(app, idx, &t))
+ return;
+
+ fprintf(stderr, "allowed insert into idx=%d\n", idx);
+
+ /* clear item */
+ memset(&item, 0, sizeof(playlist_item_t));
+ if(ui_playlist_item_dialog(app, &item))
+ {
+ item.type = t;
+ omnplay_playlist_insert_items(app, idx, &item, 1);
+ };
+};
+
+static void omnplay_playlist_item_edit(omnplay_instance_t* app)
+{
+
+};
+
static void omnplay_ctl(omnplay_instance_t* app, control_buttons_t button)
{
int i, r;
OmPlrStop((OmPlrHandle)player->handle);
/* detach previous clips */
-// player->playlist_start = -1;
-// player->playlist_count = -1;
+ player->playlist_length = -1;
OmPlrDetachAllClips((OmPlrHandle)player->handle);
};
/* setup loop */
if(app->playlist.item[start].type & OMNPLAY_PLAYLIST_BLOCK_LOOP)
OmPlrLoop((OmPlrHandle)player->handle, hs.minPos, hs.maxPos);
+ else
+ OmPlrLoop((OmPlrHandle)player->handle, hs.minPos, hs.minPos);
player->playlist_start = start;
+ player->playlist_length = stop - start + 1;
/* Cue */
OmPlrCuePlay((OmPlrHandle)player->handle, 0.0);
- OmPlrPlay((OmPlrHandle)player->handle, 0.0);
};
};
switch(button)
{
case BUTTON_PLAYLIST_ITEM_ADD:
+ omnplay_playlist_item_add(app, 0);
+ break;
case BUTTON_PLAYLIST_ITEM_DEL:
+ omnplay_playlist_item_del(app);
+ break;
case BUTTON_PLAYLIST_ITEM_EDIT:
+ omnplay_playlist_item_edit(app);
break;
case BUTTON_PLAYLIST_LOAD:
omnplay_playlist_load(app);
break;
case BUTTON_PLAYLIST_BLOCK_SINGLE:
case BUTTON_PLAYLIST_BLOCK_LOOP:
+ omnplay_playlist_block(app, button);
break;
case BUTTON_PLAYLIST_ITEM_UP:
case BUTTON_PLAYLIST_ITEM_DOWN:
projects / melted_gui / blobdiff