X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fplayer.c;h=018661f95140c95da05bfb410d8b53bdfa3ab4c8;hb=cb12ad94e4a4f01eb2b76b045dfdfa38db311883;hp=d7468b651fe9eccaa60d70b381ac5d7d3d70597b;hpb=d31575c9e3f5dac1dc7596b4cb2a8457ea2bef6b;p=melted_gui diff --git a/src/player.c b/src/player.c index d7468b6..018661f 100644 --- a/src/player.c +++ b/src/player.c @@ -35,6 +35,10 @@ #include #include +#if defined(__MINGW32__) +#include +#endif + #include "player.h" #include "ui.h" #include "timecode.h" @@ -117,7 +121,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 */ @@ -145,12 +149,17 @@ static void* player_thread_proc(void* data) /* endless reconnect loop */ for(; !player->app->f_exit;) { + r = mvcp_connect(handle->command); /* connect */ - if(mvcp_connect(handle->command) == mvcp_ok) + if(mvcp_ok != r) { - 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), r=%d\n", + player->app->players.host, player->app->players.port, player->idx, player->unit, r); +#if defined(__MINGW32__) + Sleep(1000); +#else sleep(1); +#endif continue; };