#include "opts.h"
#include "timecode.h"
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
#include "omplrclnt.h"
int omnplay_get_content(omnplay_instance_t* app, playlist_item_t *items, int limit,
OmPlrClipInfo clip_info;
char clip_name[omPlrMaxClipDirLen];
+ app->library.id_display_idx = 0;
+
pthread_mutex_lock(&app->players.lock);
r = OmPlrClipGetFirst((OmPlrHandle)app->players.item[0].handle, clip_name, sizeof(clip_name));
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];
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);
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);
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;
omnplay_playlist_draw(app);
/* select */
- path = gtk_tree_path_new_from_indices(idx + count, -1);
+ path = gtk_tree_path_new_from_indices(idx, -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);
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);
};
case BUTTON_LIBRARY_FIND_NEXT:
omnplay_library_search(app, 1);
break;
+ case BUTTON_PLAYLIST_RELINK:
+ omnplay_playlist_relink(app);
+ break;
};
return TRUE;
static gboolean on_playlist_grid_button(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
+ omnplay_instance_t* app = (omnplay_instance_t*)data;
+
// g_warning("on_playlist_grid_button");
if(event->button==1 && event->type==GDK_2BUTTON_PRESS)
{
- omnplay_ctl((omnplay_instance_t* )data, BUTTON_PLAYER_CUE);
+ omnplay_playlist_item_edit(app);
return TRUE;
};
free(list);
};
+/*
+ * http://www.mail-archive.com/mahogany-users@lists.sourceforge.net/msg00286.html
+ */
+static gboolean playlist_grid_drag_motion(GtkWidget *widget, GdkDragContext *context,
+ gint x, gint y, guint time, gpointer data)
+{
+ gboolean same;
+ GtkWidget *source_widget;
+
+ g_warning("playlist_grid_drag_motion");
+
+ /* Get source widget and check if it is the same as the
+ * destination widget.
+ */
+ source_widget = gtk_drag_get_source_widget(context);
+ same = ((source_widget == widget) ? TRUE : FALSE);
+
+ /* Put additional checks here, perhaps if same is FALSE then
+ * set the default drag to GDK_ACTION_COPY.
+ */
+
+ /* Say we just want to allow GDK_ACTION_MOVE, first we check
+ * if that is in the list of allowed actions on the dc. If
+ * so then we set it to that. Note if the user holds down the
+ * ctrl key then the only flag in dc->actions will be
+ * GDK_ACTION_COPY. The constraint for dc->actions is that
+ * specified from the given actions in gtk_drag_dest_set() and
+ * gtk_drag_source_set().
+ */
+ if(same)
+ {
+ if(context->actions == GDK_ACTION_MOVE)
+ gdk_drag_status(context, GDK_ACTION_COPY, time);
+ else
+ gdk_drag_status(context, GDK_ACTION_MOVE, time);
+ }
+ else
+ gdk_drag_status(context, context->actions, time);
+
+ return(TRUE);
+}
+
void omnplay_init(omnplay_instance_t* app)
{
int i;
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,
+ gtk_drag_dest_set(app->playlist_grid, (GtkDestDefaults)(GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP),
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_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);
g_signal_connect (app->playlist_grid, "drag_data_delete", G_CALLBACK (playlist_grid_drag_data_delete), app);
+ g_signal_connect (app->playlist_grid, "drag_motion", G_CALLBACK (playlist_grid_drag_motion), app);
};
void omnplay_release(omnplay_instance_t* app)
projects / omnplay / blobdiff