if(player->app->players.path[0])
{
pthread_mutex_lock(&player->app->players.lock);
-// r = OmPlrClipSetDirectory((OmPlrHandle)player->handle, player->app->players.path);
+ r = OmPlrClipSetDirectory((OmPlrHandle)player->handle, player->app->players.path);
pthread_mutex_unlock(&player->app->players.lock);
if(r)
return NULL;
};
-static void omnplay_cue(omnplay_instance_t* app)
+static int get_first_selected_item_playlist(omnplay_instance_t* app)
{
- int idx, start, stop;
+ int idx;
GtkTreeIter iter;
GtkTreeModel *model;
GtkTreeSelection *selection;
- omnplay_player_t *player;
-
- pthread_mutex_lock(&app->playlist.lock);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(app->playlist_grid));
if(selection && gtk_tree_selection_get_selected(selection, &model, &iter))
{
gtk_tree_model_get(model, &iter, 7, &idx, -1);
+ return idx;
+ };
+ return -1;
+};
+
+static int get_playlist_block(omnplay_instance_t* app, int idx, int* start_ptr, int* stop_ptr)
+{
+ int start, stop;
+
+ for(start = idx; start >= 0; start--)
+ if(app->playlist.item[start].type & OMNPLAY_PLAYLIST_BLOCK_BEGIN)
+ break;
+
+ for(stop = idx; stop < app->playlist.count; stop++)
+ if(app->playlist.item[stop].type & OMNPLAY_PLAYLIST_BLOCK_END)
+ break;
+
+ fprintf(stderr, "get_playlist_block: range %d -> %d\n", start, stop);
+
+ /* check block range */
+ if(start >= 0 && stop < app->playlist.count)
+ {
+ *start_ptr = start;
+ *stop_ptr = stop;
+ return (stop - start + 1);
+ };
+
+ return -1;
+};
+
+static omnplay_player_t *get_player_at_pos(omnplay_instance_t* app, int pos)
+{
+ /* check player range */
+ if(app->playlist.item[pos].player > -1 && app->playlist.item[pos].player < app->players.count)
+ return &app->players.item[app->playlist.item[pos].player];
+
+ return NULL;
+};
+
+static void omnplay_ctl(omnplay_instance_t* app, control_buttons_t button)
+{
+ int i, r;
+ int idx, start, stop;
+ omnplay_player_t *player;
+
+ pthread_mutex_lock(&app->playlist.lock);
+
+ idx = get_first_selected_item_playlist(app);
+
+ if(idx < 0)
+ {
+ pthread_mutex_unlock(&app->playlist.lock);
+ return;
+ };
- fprintf(stderr, "cue: selected item is %d\n", idx);
+ fprintf(stderr, "cue: selected item is %d\n", idx);
- for(start = idx; start >= 0; start--)
- if(app->playlist.item[start].type & OMNPLAY_PLAYLIST_BLOCK_BEGIN)
- break;
+ if(get_playlist_block(app, idx, &start, &stop) < 0)
+ {
+ pthread_mutex_unlock(&app->playlist.lock);
+ return;
+ };
+
+ fprintf(stderr, "cue: range %d -> %d\n", start, stop);
- for(stop = idx; stop < app->playlist.count; stop++)
- if(app->playlist.item[stop].type & OMNPLAY_PLAYLIST_BLOCK_END)
- break;
+ player = get_player_at_pos(app, start);
+
+ if(!player)
+ {
+ pthread_mutex_unlock(&app->playlist.lock);
+ return;
+ };
+
+ pthread_mutex_lock(&app->players.lock);
+
+ if(BUTTON_PLAYER_STOP == button || BUTTON_PLAYER_CUE == button)
+ {
+ /* stop */
+ OmPlrStop((OmPlrHandle)player->handle);
- /* check block range */
- if(start >= 0 && stop < app->playlist.count)
+ /* detach previous clips */
+ player->playlist_start = -1;
+ player->playlist_count = -1;
+ OmPlrDetachAllClips((OmPlrHandle)player->handle);
+ };
+
+ if(BUTTON_PLAYER_CUE == button)
+ {
+ int o, c, p = 0;
+
+ /* Attach clips to timeline */
+ for(i = start, c = 0, o = 0; i <= stop; i++)
{
- fprintf(stderr, "cue: range %d -> %d\n", start, stop);
+ unsigned int l;
- /* check player range */
- if(app->playlist.item[start].player > -1 && app->playlist.item[start].player < player->app->players.count)
- {
- player = &app->players.item[app->playlist.item[start].player];
+ r = OmPlrAttach((OmPlrHandle)player->handle,
+ app->playlist.item[i].id,
+ app->playlist.item[i].in,
+ app->playlist.item[i].in + app->playlist.item[i].dur,
+ 0, omPlrShiftModeAfter, &l);
- /* 1. stop */
- pthread_mutex_lock(&app->players.lock);
- OmPlrStop((OmPlrHandle)player->handle);
- pthread_mutex_unlock(&app->players.lock);
+ if(r)
+ {
+ fprintf(stderr, "cue: failed with %d, %s\n", r, OmPlrGetErrorString((OmPlrError)r));
+ app->playlist.item[i].omn_idx = -1;
+ app->playlist.item[i].omn_offset = -1;
+ }
+ else
+ {
+ app->playlist.item[i].omn_idx = c;
+ app->playlist.item[i].omn_offset = o;
- /* 2. detach previous clips */
- pthread_mutex_lock(&app->players.lock);
- OmPlrDetachAllClips((OmPlrHandle)player->handle);
- pthread_mutex_unlock(&app->players.lock);
+ /* save selected item offset */
+ if(i == idx) p = o;
- // http://research.m1stereo.tv/viewvc-int/viewvc.cgi/Ingest2Srv/trunk/SrvPlayCtl.cpp?view=markup
+ c++;
+ o += app->playlist.item[i].dur;
};
};
+
+ if(c)
+ {
+ OmPlrStatus hs;
+
+ /* Set timeline min/max */
+ OmPlrSetMinPosMin((OmPlrHandle)player->handle);
+ OmPlrSetMaxPosMax((OmPlrHandle)player->handle);
+
+ /* Set timeline position */
+ hs.minPos = 0;
+ hs.size = sizeof(OmPlrStatus);
+ OmPlrGetPlayerStatus((OmPlrHandle)player->handle, &hs);
+ OmPlrSetPos((OmPlrHandle)player->handle, hs.minPos + p);
+
+ /* Cue */
+ OmPlrCuePlay((OmPlrHandle)player->handle, 0.0);
+ OmPlrPlay((OmPlrHandle)player->handle, 0.0);
+
+ player->playlist_start = start;
+ player->playlist_count = stop - start + 1;
+ };
};
- pthread_mutex_unlock(&app->playlist.lock);
+ if(BUTTON_PLAYER_PLAY == button)
+ {
+ /* play */
+ OmPlrPlay((OmPlrHandle)player->handle, 1.0);
+ };
+
+ if(BUTTON_PLAYER_PAUSE == button)
+ /* pause */
+ OmPlrPlay((OmPlrHandle)player->handle, 0.0);
+ pthread_mutex_unlock(&app->players.lock);
+
+ pthread_mutex_unlock(&app->playlist.lock);
};
static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t button)
case BUTTON_PLAYLIST_ITEM_ADD:
case BUTTON_PLAYLIST_ITEM_DEL:
case BUTTON_PLAYLIST_ITEM_EDIT:
+ break;
case BUTTON_PLAYLIST_LOAD:
omnplay_playlist_load(app);
break;
break;
case BUTTON_PLAYLIST_BLOCK_SINGLE:
case BUTTON_PLAYLIST_BLOCK_LOOP:
+ break;
case BUTTON_PLAYLIST_ITEM_UP:
case BUTTON_PLAYLIST_ITEM_DOWN:
+ break;
case BUTTON_PLAYER_CUE:
- omnplay_cue(app);
case BUTTON_PLAYER_PLAY:
case BUTTON_PLAYER_PAUSE:
case BUTTON_PLAYER_STOP:
+ omnplay_ctl(app, button);
+ break;
case BUTTON_LIBRARY_ADD:
case BUTTON_LIBRARY_REFRESH:
break;
projects / omnplay / blobdiff