X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fomnplay.cpp;h=718ff74b816ec09bcbeaf2e37f777d10025260e6;hb=48dee11ecb5cc6c4006f8dcc47ca4c7cf57b8b0e;hp=52d88ee64e8be5ac3117134aaba772941f7866fb;hpb=df1b624ba12decf6a5b369113fecba02ef0c1512;p=melted_gui diff --git a/src/omnplay.cpp b/src/omnplay.cpp index 52d88ee..718ff74 100644 --- a/src/omnplay.cpp +++ b/src/omnplay.cpp @@ -143,7 +143,7 @@ static int find_index_of_playlist_item(omnplay_instance_t* app, int start, int i 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]; @@ -188,31 +188,34 @@ static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev , gdk_threads_enter(); pthread_mutex_lock(&player->app->playlist.lock); pthread_mutex_lock(&player->app->players.lock); - if(curr->state == omPlrStatePlay || curr->state == omPlrStateCuePlay) + + /* check if playlist exist */ + if(player->playlist_length) { - idx = find_index_of_playlist_item(player->app, player->playlist_start, curr->currClipNum); - if(idx >= 0) - { - frames2tc(curr->currClipStartPos + curr->currClipLen - curr->pos, 25.0, tc_rem); - omnplay_playlist_draw_item_rem(player->app, idx, tc_rem); - } - if(curr->currClipNum != prev->currClipNum && 1 != prev->numClips) + /* clear remain on "previous" item */ + 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); }; - } - else - { - tc_rem[0] = 0; + + /* update current item */ idx = find_index_of_playlist_item(player->app, player->playlist_start, curr->currClipNum); if(idx >= 0) + { + /* reset value */ + tc_rem[0] = 0; + + /* for play and cue calc new value */ + if(curr->state == omPlrStatePlay || curr->state == omPlrStateCuePlay) + frames2tc(curr->currClipStartPos + curr->currClipLen - curr->pos, 25.0, tc_rem); + + /* setup that value */ omnplay_playlist_draw_item_rem(player->app, idx, tc_rem); - idx = find_index_of_playlist_item(player->app, player->playlist_start, prev->currClipNum); - if(idx >= 0) - omnplay_playlist_draw_item_rem(player->app, idx, tc_rem); + }; }; pthread_mutex_unlock(&player->app->players.lock); pthread_mutex_unlock(&player->app->playlist.lock); @@ -226,6 +229,7 @@ static void omnplay_update_status(omnplay_player_t* player, OmPlrStatus *prev , 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; @@ -290,8 +294,11 @@ static void* omnplay_thread_proc(void* 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); @@ -569,6 +576,32 @@ static void omnplay_playlist_item_del(omnplay_instance_t* app) free(list); }; +void omnplay_playlist_relink(omnplay_instance_t* app) +{ + int i, idx, c; + int *list; + + pthread_mutex_lock(&app->playlist.lock); + list = omnplay_selected_idxs_playlist(app); + if(list) + { + for(i = 0, c = 0; i < list[0]; i++) + { + /* check for playing block */ + if(idx_in_players_range(app, list[i + 1])) + continue; + /* relink item */ + omnplay_library_relink_item(app, &app->playlist.item[list[i + 1]]); + }; + + free(list); + }; + pthread_mutex_unlock(&app->playlist.lock); + + /* redraw playlist */ + omnplay_playlist_draw(app); +}; + static int omnplay_playlist_insert_check(omnplay_instance_t* app, int idx, playlist_item_type_t* t) { *t = OMNPLAY_PLAYLIST_ITEM_BLOCK_SINGLE; @@ -755,24 +788,30 @@ static void omnplay_ctl(omnplay_instance_t* app, control_buttons_t button) 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); }; @@ -997,6 +1036,9 @@ static gboolean omnplay_button_click(omnplay_instance_t* app, control_buttons_t case BUTTON_LIBRARY_FIND_NEXT: omnplay_library_search(app, 1); break; + case BUTTON_PLAYLIST_RELINK: + omnplay_playlist_relink(app); + break; }; return TRUE;