eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix: prevent crash and report correct warning message on media player

Browse Source 
loading error.
This commit is contained in:
brunoherbelin
2020-09-13 23:21:37 +02:00
parent 5ebf80b0cd
commit 68b219eef2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaPlayer.cpp
View File

@@ -93,22 +93,22 @@ static MediaInfo UriDiscoverer_(std::string uri)
GstDiscovererResult result = gst_discoverer_info_get_result (info); GstDiscovererResult result = gst_discoverer_info_get_result (info);
switch (result) { switch (result) {
case GST_DISCOVERER_URI_INVALID: case GST_DISCOVERER_URI_INVALID:
Log::Warning("Invalid URI '%s'", uri.c_str()); Log::Warning("'%s': Invalid URI", uri.c_str());
break; break;
case GST_DISCOVERER_ERROR: case GST_DISCOVERER_ERROR:
Log::Warning("Warning: %s", err->message); Log::Warning("'%s': %s", uri.c_str(), err->message);
break; break;
case GST_DISCOVERER_TIMEOUT: case GST_DISCOVERER_TIMEOUT:
Log::Warning("Timeout loading URI '%s'", uri.c_str()); Log::Warning("'%s': Timeout loading", uri.c_str());
break; break;
case GST_DISCOVERER_BUSY: case GST_DISCOVERER_BUSY:
Log::Warning("Busy URI '%s'", uri.c_str()); Log::Warning("'%s': Busy", uri.c_str());
break; break;
case GST_DISCOVERER_MISSING_PLUGINS: case GST_DISCOVERER_MISSING_PLUGINS:
{ {
const GstStructure *s = gst_discoverer_info_get_misc (info); const GstStructure *s = gst_discoverer_info_get_misc (info);
gchar *str = gst_structure_to_string (s); gchar *str = gst_structure_to_string (s);
Log::Warning("Warning: Unknown file format %s", str); Log::Warning("'%s': Unknown file format %s", uri.c_str(), str);
g_free (str); g_free (str);
} }
break; break;
@@ -709,7 +709,7 @@ void MediaPlayer::update()
return; return;
// not ready yet // not ready yet
if (!ready_) { if (!ready_ && discoverer_.valid()) {
// try to get info from discoverer // try to get info from discoverer
if (discoverer_.wait_for( std::chrono::milliseconds(4) ) == std::future_status::ready ) if (discoverer_.wait_for( std::chrono::milliseconds(4) ) == std::future_status::ready )
{ {