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

Unified & fixed implementation of Group of sources (formerly flatten)

Browse Source 
Fixed MixingGroup keep&restore when making Session Group Sources. New global feature to Group all sources into one session source. Unused but potentially useful implementation of flatten of mixer session into one new session source.
This commit is contained in:
Bruno Herbelin
2022-03-24 00:23:27 +01:00
parent e5926a5371
commit 46b707f246
7 changed files with 176 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaPlayer.cpp
View File

@@ -36,6 +36,8 @@
#define MEDIA_PLAYER_DEBUG
#endif
#define DISCOVER_TIMOUT 15
std::list<MediaPlayer*> MediaPlayer::registered_;
MediaPlayer::MediaPlayer()
@@ -123,7 +125,7 @@ MediaInfo MediaPlayer::UriDiscoverer(const std::string &uri)
#endif
MediaInfo video_stream_info;
GError *err = NULL;
GstDiscoverer *discoverer = gst_discoverer_new (15 * GST_SECOND, &err);
GstDiscoverer *discoverer = gst_discoverer_new (DISCOVER_TIMOUT * GST_SECOND, &err);
/* Instantiate the Discoverer */
if (!discoverer) {
@@ -448,7 +450,8 @@ void MediaPlayer::close()
if (!opened_) {
// wait for loading to finish
if (discoverer_.valid())
discoverer_.wait();
if ( discoverer_.wait_for(std::chrono::seconds(DISCOVER_TIMOUT)) == std::future_status::timeout )
failed_ = true;
// nothing else to change
return;
}