Yessiest
/
libretro-mpv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Exit on libmpv failure 

These errors shouldn't happen. But if they do we don't want to continue.

Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
This commit is contained in:
Mahyar Koshkouei 2018-01-14 11:15:05 +00:00
parent 3f882b445d
commit 87d4158ee1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mpv-libretro.c
View File

@ -180,23 +180,20 @@ static void context_reset(void)
if(!mpv) if(!mpv)
{ {
log_cb(RETRO_LOG_ERROR, "failed creating context\n"); log_cb(RETRO_LOG_ERROR, "failed creating context\n");
return; exit(EXIT_FAILURE);
} }
if(mpv_initialize(mpv) < 0) if(mpv_initialize(mpv) < 0)
{ {
log_cb(RETRO_LOG_ERROR, "mpv init failed\n"); log_cb(RETRO_LOG_ERROR, "mpv init failed\n");
return; exit(EXIT_FAILURE);
} }
/* When normal mpv events are available. */ /* When normal mpv events are available. */
mpv_set_wakeup_callback(mpv, on_mpv_events, NULL); mpv_set_wakeup_callback(mpv, on_mpv_events, NULL);
if(mpv_request_log_messages(mpv, "info") < 0) if(mpv_request_log_messages(mpv, "info") < 0)
{
log_cb(RETRO_LOG_ERROR, "mpv logging failed\n"); log_cb(RETRO_LOG_ERROR, "mpv logging failed\n");
return;
}
/* The OpenGL API is somewhat separate from the normal mpv API. This only /* The OpenGL API is somewhat separate from the normal mpv API. This only
* returns NULL if no OpenGL support is compiled. * returns NULL if no OpenGL support is compiled.
@ -206,28 +203,31 @@ static void context_reset(void)
if(!mpv_gl) if(!mpv_gl)
{ {
log_cb(RETRO_LOG_ERROR, "failed to create mpv GL API handle\n"); log_cb(RETRO_LOG_ERROR, "failed to create mpv GL API handle\n");
return; exit(EXIT_FAILURE);
} }
if(mpv_opengl_cb_init_gl(mpv_gl, NULL, get_proc_address_mpv, NULL) < 0) if(mpv_opengl_cb_init_gl(mpv_gl, NULL, get_proc_address_mpv, NULL) < 0)
{
log_cb(RETRO_LOG_ERROR, "failed to initialize mpv GL context\n"); log_cb(RETRO_LOG_ERROR, "failed to initialize mpv GL context\n");
exit(EXIT_FAILURE);
}
/* Actually using the opengl_cb state has to be explicitly requested. /* Actually using the opengl_cb state has to be explicitly requested.
* Otherwise, mpv will create a separate platform window. * Otherwise, mpv will create a separate platform window.
*/ */
if(mpv_set_option_string(mpv, "vo", "opengl-cb") < 0) if(mpv_set_option_string(mpv, "vo", "opengl-cb") < 0)
{ {
log_cb(RETRO_LOG_ERROR, "failed to set VO"); log_cb(RETRO_LOG_ERROR, "failed to set video output to OpenGL\n");
return; exit(EXIT_FAILURE);
} }
if(mpv_set_option_string(mpv, "hwdec", "auto") < 0) if(mpv_set_option_string(mpv, "hwdec", "auto") < 0)
log_cb(RETRO_LOG_ERROR, "failed to set hwdec option"); log_cb(RETRO_LOG_ERROR, "failed to set hwdec option\n");
if(mpv_command(mpv, cmd) != 0) if(mpv_command(mpv, cmd) != 0)
{ {
log_cb(RETRO_LOG_ERROR, "failed to issue mpv_command\n"); log_cb(RETRO_LOG_ERROR, "failed to issue mpv_command\n");
return; exit(EXIT_FAILURE);
} }
/* Keep trying until mpv accepts the property. This is done to seek to the /* Keep trying until mpv accepts the property. This is done to seek to the