[origin] Bump up to 2024.06.26 [113.3.1]

(cherry picked from commit 4ac938c)
melchi45 · Jul 9, 2024 · 9d1cdb5 · 9d1cdb5
1 parent c300a53
commit 9d1cdb5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;