Skip to content

Commit 9d1cdb5

Browse files
committed
[origin] Bump up to 2024.06.26 [113.3.1]
(cherry picked from commit 4ac938c)
1 parent c300a53 commit 9d1cdb5

File tree

6 files changed

+19
-15
lines changed

6 files changed

+19
-15
lines changed

BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
1919
#ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
2020
#define _BASICUSAGEENVIRONMENT_VERSION_HH
2121

22-
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.05.30"
23-
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1717027200
22+
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.06.26"
23+
#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT 1719360000
2424

2525
extern char const* const BasicUsageEnvironmentLibraryVersionStr;
2626
extern int const BasicUsageEnvironmentLibraryVersionInt;

UsageEnvironment/include/UsageEnvironment_version.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
1919
#ifndef _USAGEENVIRONMENT_VERSION_HH
2020
#define _USAGEENVIRONMENT_VERSION_HH
2121

22-
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.05.30"
23-
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1717027200
22+
#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING "2024.06.26"
23+
#define USAGEENVIRONMENT_LIBRARY_VERSION_INT 1719360000
2424

2525
extern char const* const UsageEnvironmentLibraryVersionStr;
2626
extern int const UsageEnvironmentLibraryVersionInt;

config.linux-with-shared-libraries

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
55

66
libliveMedia_VERSION_CURRENT=113
7-
libliveMedia_VERSION_REVISION=2
7+
libliveMedia_VERSION_REVISION=3
88
libliveMedia_VERSION_AGE=1
99
libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
1010

groupsock/include/groupsock_version.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
1919
#ifndef _GROUPSOCK_VERSION_HH
2020
#define _GROUPSOCK_VERSION_HH
2121

22-
#define GROUPSOCK_LIBRARY_VERSION_STRING "2024.05.30"
23-
#define GROUPSOCK_LIBRARY_VERSION_INT 1717027200
22+
#define GROUPSOCK_LIBRARY_VERSION_STRING "2024.06.26"
23+
#define GROUPSOCK_LIBRARY_VERSION_INT 1719360000
2424

2525
extern char const* const groupsockLibraryVersionStr;
2626
extern int const groupsockLibraryVersionInt;

liveMedia/OnDemandServerMediaSubsession.cpp

+10-6
Original file line numberDiff line numberDiff line change
@@ -571,13 +571,17 @@ ::startPlaying(Destinations* dests, unsigned clientSessionId,
571571
}
572572

573573
if (!fAreCurrentlyPlaying && fMediaSource != NULL) {
574-
if (fRTPSink != NULL) {
575-
fRTPSink->startPlaying(*fMediaSource, afterPlayingStreamState, this);
576-
fAreCurrentlyPlaying = True;
577-
} else if (fUDPSink != NULL) {
578-
fUDPSink->startPlaying(*fMediaSource, afterPlayingStreamState, this);
579-
fAreCurrentlyPlaying = True;
574+
MediaSink* sink;
575+
if (fRTPSink != NULL) { sink = fRTPSink; }
576+
else if (fUDPSink != NULL) { sink = fUDPSink; }
577+
else return;
578+
579+
if (!sink->startPlaying(*fMediaSource, afterPlayingStreamState, this)) {
580+
fMediaSource->envir() << "sink->startPlaying() failed: "
581+
<< fMediaSource->envir().getResultMsg() << "\n";
582+
return;
580583
}
584+
fAreCurrentlyPlaying = True;
581585
}
582586
}
583587

liveMedia/include/liveMedia_version.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
1919
#ifndef _LIVEMEDIA_VERSION_HH
2020
#define _LIVEMEDIA_VERSION_HH
2121

22-
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2024.05.30"
23-
#define LIVEMEDIA_LIBRARY_VERSION_INT 1717027200
22+
#define LIVEMEDIA_LIBRARY_VERSION_STRING "2024.06.26"
23+
#define LIVEMEDIA_LIBRARY_VERSION_INT 1719360000
2424

2525
extern char const* const liveMediaLibraryVersionStr;
2626
extern int const liveMediaLibraryVersionInt;

0 commit comments

Comments
 (0)