AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS)
-AC_ARG_WITH([ommedia],
- [AS_HELP_STRING([--with-ommedia=path], [path to ommedia /Media API/])],
- [OMMEDIA_PATH=$withval],
- [OMMEDIA_PATH=/usr/local/omneon/ommedia])
-
-AC_ARG_WITH([omplrlib],
- [AS_HELP_STRING([--with-omplrlib=path], [path to omplrlib /Player API/])],
- [OMPLRLIB_PATH=$withval],
- [OMPLRLIB_PATH=/usr/local/omneon/omplrlib])
-
-OM_CFLAGS="-I$OMPLRLIB_PATH/include -I$OMMEDIA_PATH/include"
-AC_SUBST(OM_CFLAGS)
-
-OM_LIBS="-L$OMPLRLIB_PATH/lib -L$OMMEDIA_PATH/lib -lomplrlib -lommedia"
-AC_SUBST(OM_LIBS)
+AC_ARG_WITH([melted],
+ [AS_HELP_STRING([--with-melted=path], [path to melted source])],
+ [MELTED_PATH=$withval],
+ [MELTED_PATH=/home/verem/devel/melted.git])
+AC_SUBST(MELTED_PATH)
+
+MELTED_CFLAGS="-I$MELTED_PATH/src -I$MELTED_PATH/src/mvcp -DMVCP_EMBEDDED"
+AC_SUBST(MELTED_CFLAGS)
dnl #GETTEXT_PACKAGE=omnplay
dnl #AC_SUBST(GETTEXT_PACKAGE)
#include "ui.h"
#include "opts.h"
#include "timecode.h"
+#include "player.h"
static gboolean on_main_window_delete_event( GtkWidget *widget, GdkEvent *event, gpointer user_data )
{
pthread_mutex_init(&app->library.lock, &attr);
pthread_mutexattr_destroy(&attr);
-#if 0
- /* create a status thread */
+ /* run unit monitoring threads */
for(i = 0; i < app->players.count; i++)
- app->players.item[i].thread = g_thread_create(
- omnplay_thread_proc, &app->players.item[i], TRUE, NULL);
+ player_run(app, i);
+
+#if 0
/* attach buttons click */
for(i = 1; i < BUTTON_LAST; i++)
app->f_exit = 1;
+ /* stop unit monitoring threads */
for(i = 0; i < app->players.count; i++)
- /* create a omneon status thread */
- g_thread_join(app->players.item[i].thread);
+ player_stop(app, i);
/* destroy lock */
pthread_mutex_destroy(&app->players.lock);
--- /dev/null
+/*
+ * player.h -- GTK+ 2 melted gui
+ * Copyright (C) 2012 Maksym Veremeyenko <verem@m1stereo.tv>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * 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
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <pthread.h>
+
+#include <mvcp/mvcp.h>
+#include <mvcp/mvcp_remote.h>
+
+#include "player.h"
+
+static void* player_thread_proc(void* data)
+{
+ int r;
+ int playlist_start_prev = 0;
+// OmPlrStatus st_curr, st_prev;
+ player_t* player = (player_t*)data;
+
+ g_warning("omnplay_thread_proc\n");
+
+// memset(&st_curr, 0, sizeof(OmPlrStatus));
+// memset(&st_prev, 0, sizeof(OmPlrStatus));
+
+ /* connect */
+ pthread_mutex_lock(&player->app->players.lock);
+// r = OmPlrOpen(player->host, player->name, (OmPlrHandle*)&player->handle);
+ pthread_mutex_unlock(&player->app->players.lock);
+ if(r)
+ {
+// g_warning("ERROR: OmPlrOpen(%s, %s) failed with 0x%.8X\n",
+// player->host, player->name, r);
+
+ return (void*)r;
+ };
+
+ /* setup to do not reconnect */
+ pthread_mutex_lock(&player->app->players.lock);
+// OmPlrSetRetryOpen((OmPlrHandle)player->handle, 0);
+ pthread_mutex_unlock(&player->app->players.lock);
+
+ /* setup directory */
+// if(player->app->players.path[0])
+ {
+ pthread_mutex_lock(&player->app->players.lock);
+// r = OmPlrClipSetDirectory((OmPlrHandle)player->handle, player->app->players.path);
+ pthread_mutex_unlock(&player->app->players.lock);
+
+ if(r)
+ {
+// g_warning("ERROR: OmPlrClipSetDirectory(%s) failed with 0x%.8X\n",
+// player->app->players.path, r);
+
+ pthread_mutex_lock(&player->app->players.lock);
+// OmPlrClose((OmPlrHandle)player->handle);
+ pthread_mutex_unlock(&player->app->players.lock);
+
+ return (void*)r;
+ };
+ };
+
+ /* endless loop */
+ for(r = 0 ; !player->app->f_exit && !r;)
+ {
+ /* sleep */
+#ifdef _WIN32
+ Sleep(100);
+#else
+ usleep(100000);
+#endif
+
+ /* get status */
+ pthread_mutex_lock(&player->app->players.lock);
+// st_curr.size = sizeof(OmPlrStatus);
+// r = OmPlrGetPlayerStatus((OmPlrHandle)player->handle, &st_curr);
+ pthread_mutex_unlock(&player->app->players.lock);
+
+ if(r)
+ g_warning("ERROR: OmPlrGetPlayerStatus failed with 0x%.8X\n", r);
+ else
+ {
+// 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);
+// OmPlrClose((OmPlrHandle)player->handle);
+ pthread_mutex_unlock(&player->app->players.lock);
+
+ return NULL;
+};
+
+
+void player_run(instance_t* app, int idx)
+{
+ mvcp_parser parser = mvcp_parser_init_remote(app->players.host, 5250);
+ mvcp command = mvcp_init(parser);
+
+ app->players.item[idx].thread = g_thread_create(
+ player_thread_proc, &app->players.item[idx], TRUE, NULL);
+};
+
+void player_stop(instance_t* app, int idx)
+{
+ g_thread_join(app->players.item[idx].thread);
+};
--- /dev/null
+/*
+ * player.h -- GTK+ 2 melted gui
+ * Copyright (C) 2012 Maksym Veremeyenko <verem@m1stereo.tv>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef PLAYER_H
+#define PLAYER_H
+
+#include "instance.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+void player_run(instance_t* app, int idx);
+void player_stop(instance_t* app, int idx);
+
+#ifdef __cplusplus
+};
+#endif /* __cplusplus */
+
+#endif /* PLAYER_H */
projects / melted_gui / commitdiff