return -1;
};
-static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev , OmPlrStatus *curr)
+static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev , OmPlrStatus *curr, int *playlist_start_prev)
{
int idx;
char tc_cur[32], tc_rem[32], state[32], status[32];
if(player->playlist_length)
{
/* clear remain on "previous" item */
- if(curr->currClipNum != prev->currClipNum && 1 != prev->numClips)
+ if((curr->currClipNum != prev->currClipNum && 1 != prev->numClips) ||
+ (*playlist_start_prev != player->playlist_start))
{
tc_rem[0] = 0;
- idx = find_index_of_playlist_item(player->app, player->playlist_start, prev->currClipNum);
+ idx = find_index_of_playlist_item(player->app, *playlist_start_prev, prev->currClipNum);
if(idx >= 0)
omnplay_playlist_draw_item_rem(player->app, idx, tc_rem);
};
static void* omnplay_thread_proc(void* data)
{
int r;
+ int playlist_start_prev = 0;
OmPlrStatus st_curr, st_prev;
omnplay_player_t* player = (omnplay_player_t*)data;
if(r)
g_warning("ERROR: OmPlrGetPlayerStatus failed with 0x%.8X\n", r);
else
- if(memcmp(&st_curr, &st_prev, sizeof(OmPlrStatus)))
- omnplay_update_status(player, &st_prev , &st_curr);
+ {
+ omnplay_update_status(player, &st_prev , &st_curr, &playlist_start_prev);
+ playlist_start_prev = player->playlist_start;
+ memcmp(&st_curr, &st_prev, sizeof(OmPlrStatus));
+ };
};
pthread_mutex_lock(&player->app->players.lock);
if(!r)
{
- unsigned int l;
+ unsigned int l = 0;
g_warning("OmPlrClipGetInfo(%s): firstFrame=%d, lastFrame=%d\n",
app->playlist.item[i].id, clip.firstFrame, clip.lastFrame);
- /* should we fix playlist clip timings */
- if(!(
- app->playlist.item[i].in >= clip.firstFrame &&
- app->playlist.item[i].in + app->playlist.item[i].dur <= clip.lastFrame) ||
- !app->playlist.item[i].dur)
+ /* fix IN */
+ if(app->playlist.item[i].in < clip.firstFrame || app->playlist.item[i].in > clip.lastFrame)
{
- g_warning("cue: item [%s] will be updated [%d;%d]->[%d;%d]\n",
- app->playlist.item[i].id,
- app->playlist.item[i].in, app->playlist.item[i].dur,
- clip.firstFrame, clip.lastFrame - clip.firstFrame);
-
app->playlist.item[i].in = clip.firstFrame;
- app->playlist.item[i].dur = clip.lastFrame - clip.firstFrame;
+ l++;
+ };
+
+ /* fix DUR */
+ if(app->playlist.item[i].in + app->playlist.item[i].dur > clip.lastFrame || !app->playlist.item[i].dur)
+ {
+ app->playlist.item[i].dur = clip.firstFrame - app->playlist.item[i].in;
+ l++;
+ };
+
+ /* notify */
+ if(l)
+ {
+ g_warning("cue: item [%s] will be updated to [%d;%d]\n",
+ app->playlist.item[i].id, app->playlist.item[i].in, app->playlist.item[i].dur);
omnplay_playlist_draw_item(app, i);
};