[SCM] liblivemedia/master: Re-enable synchronous interface in RTSPClient to avoid API breakage.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b2c36bd8a1214f18c60216920a28f3af1db20da4
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 5 10:40:19 2012 +0100

    Re-enable synchronous interface in RTSPClient to avoid API breakage.

diff --git a/debian/patches/022_synchronous_rtspclient.patch b/debian/patches/022_synchronous_rtspclient.patch
new file mode 100644
index 0000000..e9e8070
--- /dev/null
+++ b/debian/patches/022_synchronous_rtspclient.patch
@@ -0,0 +1,42 @@
+Description: Re-enable synchronous interface in RTSPClient to avoid API breakage.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: not-needed
+---
+ liveMedia/RTSPClient.cpp        |    3 ---
+ liveMedia/include/RTSPClient.hh |    2 --
+ 2 files changed, 5 deletions(-)
+
+--- liblivemedia.orig/liveMedia/RTSPClient.cpp
++++ liblivemedia/liveMedia/RTSPClient.cpp
+@@ -1642,7 +1642,6 @@ RTSPClient::RequestRecord* RTSPClient::R
+ }
+ 
+ 
+-#ifdef RTSPCLIENT_SYNCHRONOUS_INTERFACE
+ // Implementation of the old (synchronous) "RTSPClient" interface, using the new (asynchronous) interface:
+ RTSPClient* RTSPClient::createNew(UsageEnvironment& env,
+ 				  int verbosityLevel,
+@@ -1962,5 +1961,3 @@ void RTSPClient::timeoutHandlerForSyncIn
+   // Signal a break from the event loop (thereby returning from the blocking command):
+   fWatchVariableForSyncInterface = ~0;
+ }
+-
+-#endif
+--- liblivemedia.orig/liveMedia/include/RTSPClient.hh
++++ liblivemedia/liveMedia/include/RTSPClient.hh
+@@ -285,7 +285,6 @@ private:
+   unsigned fSessionCookieCounter;
+   Boolean fHTTPTunnelingConnectionIsPending;
+ 
+-#ifdef RTSPCLIENT_SYNCHRONOUS_INTERFACE
+   // Old "RTSPClient" interface, which performs synchronous (blocking) operations.
+   // This will eventually go away, so new applications should not use it.
+ public:
+@@ -344,7 +343,6 @@ private: // used to implement the old in
+   char fWatchVariableForSyncInterface;
+   char* fResultString;
+   int fResultCode;
+-#endif
+ };
+ 
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index f3f2439..1c0e127 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 010_propagate_cflags.diff
 020_invalid_casts.diff
 021_ip_mreq_source.diff
+022_synchronous_rtspclient.patch

-- 
liblivemedia packaging