[haiku-commits] haiku: hrev52879 - src/add-ons/media/plugins/rtsp_streamer

  • From: Barrett17 <b.vitruvio@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 17 Feb 2019 08:11:25 -0500 (EST)

hrev52879 adds 1 changeset to branch 'master'
old head: 7928a43a8466ece75cbba21274e2d9a9cd3eed33
new head: a06d611775e05309bb4c1ea94d28de9594a8f353
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=a06d611775e0+%5E7928a43a8466

----------------------------------------------------------------------------

a06d611775e0: rtsp_streamer: Update to last codec kit API
  
  * Fix build

                                        [ Barrett17 <b.vitruvio@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52879
Commit:      a06d611775e05309bb4c1ea94d28de9594a8f353
URL:         https://git.haiku-os.org/haiku/commit/?id=a06d611775e0
Author:      Barrett17 <b.vitruvio@xxxxxxxxx>
Date:        Sun Feb 17 13:10:28 2019 UTC

----------------------------------------------------------------------------

5 files changed, 28 insertions(+), 15 deletions(-)
src/add-ons/media/plugins/rtsp_streamer/Jamfile     |  5 +----
.../media/plugins/rtsp_streamer/RTSPMediaIO.cpp     |  3 +++
.../media/plugins/rtsp_streamer/RTSPMediaIO.h       |  2 ++
.../plugins/rtsp_streamer/RTSPStreamerPlugin.cpp    | 17 ++++++++++-------
.../plugins/rtsp_streamer/RTSPStreamerPlugin.h      | 16 ++++++++++++----

----------------------------------------------------------------------------

diff --git a/src/add-ons/media/plugins/rtsp_streamer/Jamfile 
b/src/add-ons/media/plugins/rtsp_streamer/Jamfile
index 974f942f89..f46c0a54a9 100644
--- a/src/add-ons/media/plugins/rtsp_streamer/Jamfile
+++ b/src/add-ons/media/plugins/rtsp_streamer/Jamfile
@@ -1,8 +1,5 @@
 SubDir HAIKU_TOP src add-ons media plugins rtsp_streamer ;
 
-UsePrivateHeaders media shared ;
-UsePrivateHeaders [ FDirName media experimental ] ;
-
 # TODO: Investigate this
 SubDirC++Flags -w ;
 
@@ -24,7 +21,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
                        rtsp.cpp
                        :
                        [ BuildFeatureAttribute live555 : libraries ]
-                       be media network bnetapi shared
+                       be codec network bnetapi shared
                        [ TargetLibstdc++ ] [ TargetLibsupc++ ]
                ;
        }
diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.cpp 
b/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.cpp
index 8c7742b884..43800d9c4b 100644
--- a/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.cpp
+++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.cpp
@@ -10,6 +10,9 @@
 #define LIVE555_VERBOSITY 1
 
 
+using namespace BCodecKit;
+
+
 RTSPMediaIO::RTSPMediaIO(BUrl ourUrl)
        :
        BAdapterIO(
diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h 
b/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h
index ee79dbddac..8a542d6c6a 100644
--- a/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h
+++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h
@@ -11,6 +11,8 @@
 
 #include "rtsp.h"
 
+using BCodecKit::BAdapterIO;
+using BCodecKit::BInputAdapter;
 
 class HaikuRTSPClient;
 
diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp 
b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp
index 594992f361..21334f37e8 100644
--- a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp
+++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.cpp
@@ -8,7 +8,16 @@
 #include "RTSPMediaIO.h"
 
 
+B_DECLARE_CODEC_KIT_PLUGIN(
+       RTSPStreamerPlugin,
+       "rtsp_streamer",
+       B_CODEC_KIT_PLUGIN_VERSION
+);
+
+
 RTSPStreamer::RTSPStreamer()
+       :
+       BStreamer()
 {
 }
 
@@ -32,14 +41,8 @@ RTSPStreamer::Sniff(const BUrl& url, BDataIO** source)
 }
 
 
-Streamer*
+BStreamer*
 RTSPStreamerPlugin::NewStreamer()
 {
        return new RTSPStreamer();
 }
-
-
-MediaPlugin *instantiate_plugin()
-{
-       return new RTSPStreamerPlugin();
-}
diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h 
b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h
index 3bec1ae98a..3eeca1d3b4 100644
--- a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h
+++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h
@@ -1,9 +1,17 @@
+/*
+ * Copyright 2016-2019, Dario Casalinuovo
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _RTSP_STREAMER_PLUGIN_H
 #define _RTSP_STREAMER_PLUGIN_H
 
-#include "StreamerPlugin.h"
+#include <Streamer.h>
 
-class RTSPStreamer : public Streamer
+using BCodecKit::BStreamer;
+using BCodecKit::BStreamerPlugin;
+
+
+class RTSPStreamer : public BStreamer
 {
 public:
                                                                RTSPStreamer();
@@ -13,9 +21,9 @@ public:
 };
 
 
-class RTSPStreamerPlugin : public StreamerPlugin {
+class RTSPStreamerPlugin : public BStreamerPlugin {
 public:
-       virtual Streamer*                       NewStreamer();
+       virtual BStreamer*                      NewStreamer();
 };
 
 #endif // _RTSP_STREAMER_PLUGIN_H


Other related posts:

  • » [haiku-commits] haiku: hrev52879 - src/add-ons/media/plugins/rtsp_streamer - Barrett17