From 9d1cdb52ffd45f26fd882e72630059305483c4db Mon Sep 17 00:00:00 2001 From: melchi45 Date: Tue, 9 Jul 2024 17:41:33 +0900 Subject: [PATCH] [origin] Bump up to 2024.06.26 [113.3.1] (cherry picked from commit 4ac938c8e935a60c80b37a527bc5b9d738ea4a3f) --- .../include/BasicUsageEnvironment_version.hh | 4 ++-- .../include/UsageEnvironment_version.hh | 4 ++-- config.linux-with-shared-libraries | 2 +- groupsock/include/groupsock_version.hh | 4 ++-- liveMedia/OnDemandServerMediaSubsession.cpp | 16 ++++++++++------ liveMedia/include/liveMedia_version.hh | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh b/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh index a491a1b..1574a3f 100644 --- a/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh +++ b/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh @@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc., #ifndef _BASICUSAGEENVIRONMENT_VERSION_HH #define _BASICUSAGEENVIRONMENT_VERSION_HH -#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.05.30" -#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1717027200 +#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.06.26" +#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1719360000 extern char const* const BasicUsageEnvironmentLibraryVersionStr; extern int const BasicUsageEnvironmentLibraryVersionInt; diff --git a/UsageEnvironment/include/UsageEnvironment_version.hh b/UsageEnvironment/include/UsageEnvironment_version.hh index a0773df..797ce53 100644 --- a/UsageEnvironment/include/UsageEnvironment_version.hh +++ b/UsageEnvironment/include/UsageEnvironment_version.hh @@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc., #ifndef _USAGEENVIRONMENT_VERSION_HH #define _USAGEENVIRONMENT_VERSION_HH -#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.05.30" -#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1717027200 +#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.06.26" +#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1719360000 extern char const* const UsageEnvironmentLibraryVersionStr; extern int const UsageEnvironmentLibraryVersionInt; diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries index 3cb74f1..ea120de 100644 --- a/config.linux-with-shared-libraries +++ b/config.linux-with-shared-libraries @@ -4,7 +4,7 @@ # One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1 libliveMedia_VERSION_CURRENT=113 -libliveMedia_VERSION_REVISION=2 +libliveMedia_VERSION_REVISION=3 libliveMedia_VERSION_AGE=1 libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION) diff --git a/groupsock/include/groupsock_version.hh b/groupsock/include/groupsock_version.hh index 0c8b346..f139891 100644 --- a/groupsock/include/groupsock_version.hh +++ b/groupsock/include/groupsock_version.hh @@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc., #ifndef _GROUPSOCK_VERSION_HH #define _GROUPSOCK_VERSION_HH -#define GROUPSOCK_LIBRARY_VERSION_STRING "2024.05.30" -#define GROUPSOCK_LIBRARY_VERSION_INT 1717027200 +#define GROUPSOCK_LIBRARY_VERSION_STRING "2024.06.26" +#define GROUPSOCK_LIBRARY_VERSION_INT 1719360000 extern char const* const groupsockLibraryVersionStr; extern int const groupsockLibraryVersionInt; diff --git a/liveMedia/OnDemandServerMediaSubsession.cpp b/liveMedia/OnDemandServerMediaSubsession.cpp index da2f44b..e402557 100644 --- a/liveMedia/OnDemandServerMediaSubsession.cpp +++ b/liveMedia/OnDemandServerMediaSubsession.cpp @@ -571,13 +571,17 @@ ::startPlaying(Destinations* dests, unsigned clientSessionId, } if (!fAreCurrentlyPlaying && fMediaSource != NULL) { - if (fRTPSink != NULL) { - fRTPSink->startPlaying(*fMediaSource, afterPlayingStreamState, this); - fAreCurrentlyPlaying = True; - } else if (fUDPSink != NULL) { - fUDPSink->startPlaying(*fMediaSource, afterPlayingStreamState, this); - fAreCurrentlyPlaying = True; + MediaSink* sink; + if (fRTPSink != NULL) { sink = fRTPSink; } + else if (fUDPSink != NULL) { sink = fUDPSink; } + else return; + + if (!sink->startPlaying(*fMediaSource, afterPlayingStreamState, this)) { + fMediaSource->envir() << "sink->startPlaying() failed: " + << fMediaSource->envir().getResultMsg() << "\n"; + return; } + fAreCurrentlyPlaying = True; } } diff --git a/liveMedia/include/liveMedia_version.hh b/liveMedia/include/liveMedia_version.hh index 8289121..67c025f 100644 --- a/liveMedia/include/liveMedia_version.hh +++ b/liveMedia/include/liveMedia_version.hh @@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc., #ifndef _LIVEMEDIA_VERSION_HH #define _LIVEMEDIA_VERSION_HH -#define LIVEMEDIA_LIBRARY_VERSION_STRING "2024.05.30" -#define LIVEMEDIA_LIBRARY_VERSION_INT 1717027200 +#define LIVEMEDIA_LIBRARY_VERSION_STRING "2024.06.26" +#define LIVEMEDIA_LIBRARY_VERSION_INT 1719360000 extern char const* const liveMediaLibraryVersionStr; extern int const liveMediaLibraryVersionInt;