add mvcp unit control

[melted_gui] / src / player.c

diff --git a/src/player.c b/src/player.c
index b07723b..206191b 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -117,7 +117,7 @@ static void player_update_status(player_t* player, mvcp_status_t *status_prev ,
             tc_rem[0] = 0;
 
             /* for play and cue calc new value */
-            if(status_curr->status == unit_stopped || status_curr->status == unit_playing || status_curr->status == unit_paused)
+            if(/*status_curr->status == unit_stopped || */ status_curr->status == unit_playing || status_curr->status == unit_paused)
                 frames2tc(status_curr->out - status_curr->position, 25.0, tc_rem);
 
             /* setup that value */
@@ -146,10 +146,10 @@ static void* player_thread_proc(void* data)
     for(; !player->app->f_exit;)
     {
         /* connect */
-        if(mvcp_connect(handle->command) == mvcp_ok)
+        if(mvcp_connect(handle->command) != mvcp_ok)
         {
-            g_warning("player_thread_proc: failed to connect to server %s (player=%d, unit=%d)\n",
-                player->app->players.host, player->idx, player->unit);
+            g_warning("player_thread_proc: failed to connect to server %s:%d (player=%d, unit=%d)\n",
+                player->app->players.host, player->app->players.port, player->idx, player->unit);
             sleep(1);
             continue;
         };
@@ -200,7 +200,7 @@ static void* player_thread_proc(void* data)
 void player_run(instance_t* app, int idx)
 {
     player_handle_t* handle = malloc(sizeof(player_handle_t));
-    handle->parser = mvcp_parser_init_remote(app->players.host, 5250);
+    handle->parser = mvcp_parser_init_remote(app->players.host, app->players.port);
     handle->status = mvcp_init(handle->parser);
     handle->command = mvcp_init(handle->parser);
     app->players.item[idx].handle = handle;