* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
/* Attach clips to timeline */
for(i = start, c = 0, o = 0; i <= stop; i++)
{
- unsigned int l;
+ OmPlrClipInfo clip;
- 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);
+ /* get clip info */
+ clip.maxMsTracks = 0;
+ clip.size = sizeof(clip);
+ r = OmPlrClipGetInfo((OmPlrHandle)player->handle, app->playlist.item[i].id, &clip);
+
+ if(!r)
+ {
+ unsigned int l;
+
+ fprintf(stderr, "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)
+ {
+ fprintf(stderr, "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;
+ omnplay_playlist_draw_item(app, i);
+ };
+
+ 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);
+ };
if(r)
{
OmPlrGetPlayerStatus((OmPlrHandle)player->handle, &hs);
OmPlrSetPos((OmPlrHandle)player->handle, hs.minPos + p);
+ /* setup loop */
+ if(app->playlist.item[start].type & OMNPLAY_PLAYLIST_BLOCK_LOOP)
+ OmPlrLoop((OmPlrHandle)player->handle, hs.minPos, hs.maxPos);
+
/* Cue */
OmPlrCuePlay((OmPlrHandle)player->handle, 0.0);
OmPlrPlay((OmPlrHandle)player->handle, 0.0);
void omnplay_init(omnplay_instance_t* app)
{
int i;
+ pthread_mutexattr_t attr;
+
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
gtk_signal_connect( GTK_OBJECT( app->window ), "destroy",
GTK_SIGNAL_FUNC(on_main_window_delete_event), app);
/* create lock */
- pthread_mutex_init(&app->players.lock, NULL);
+ pthread_mutex_init(&app->players.lock, &attr);
/* create a omneon status thread */
for(i = 0; i < app->players.count; i++)
omnplay_thread_proc, &app->players.item[i]);
/* create lock */
- pthread_mutex_init(&app->playlist.lock, NULL);
+ pthread_mutex_init(&app->playlist.lock, &attr);
/* attach buttons click */
for(i = 1; i < BUTTON_LAST; i++)