little changes to make it compile on recent ubuntu and debian versions

martinrunge · Apr 18, 2020 · b3336de · b3336de
1 parent eebc7aa
commit b3336de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,6 +10,7 @@ option( wssrv     "build stream searver with web interfave"   "yes")
 option( muroad    "build the muroa audio streaming daemon"    "yes")
 option( mqtclient "build the Qt based GUI client"             "no")
 option( unittests "build unittests"                           "no" )
+option( examples  "build the examples"                         "no")
 
 
 set(MUROA_AUX_DIR "${CMAKE_CURRENT_LIST_DIR}/aux")
@@ -73,7 +74,9 @@ endif( )
 
 if( msessiond OR muroad OR wssrv )
   add_subdirectory (libmstream)
-  add_subdirectory (libmstream/examples)
+  if( examples )
+    add_subdirectory (libmstream/examples)
+  endif()
   add_subdirectory (libmuroadaemon)  
   add_subdirectory (libsock++)
 endif( )
diff --git a/libmstream/examples/simpleserver/CMakeLists.txt b/libmstream/examples/simpleserver/CMakeLists.txt
@@ -23,7 +23,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_SOURCE_DIR}/../../../libsock++
                     ${CMAKE_CURRENT_SOURCE_DIR}/../../../libmuroadaemon
                     ${CMAKE_CURRENT_BINARY_DIR}/..
-                    ${libavutil_INCLUDE_DIR}
                     ) 
 
 link_directories(${BINARY_DIR}       "${CMAKE_SOURCE_DIR}/../../build" )

diff --git a/libmuroadaemon/CTcpConnection.cpp b/libmuroadaemon/CTcpConnection.cpp
@@ -30,6 +30,8 @@
 using namespace std;
 using namespace log4cplus;
 
+#define NEW_BOOST_ASIO
+
 namespace muroa {
 
 CTcpConnection::CTcpConnection(boost::asio::io_service& io_service) : m_socket(io_service) {

diff --git a/wssrv/CStreamDecoder.cpp b/wssrv/CStreamDecoder.cpp
@@ -43,7 +43,7 @@ CStreamDecoder::CStreamDecoder(CppServer *streamSrvPtr) : m_streamSrvPtr(streamS
 
     av_init_packet(&m_packet);
 
-	m_frame_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + FF_INPUT_BUFFER_PADDING_SIZE;
+	m_frame_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE + AV_INPUT_BUFFER_PADDING_SIZE;
 	m_frame_buffer = new uint8_t[m_frame_buffer_size];
 
 	m_res_frame_buffer_size = m_frame_buffer_size;