From d004f813045155f0810c57ec0d0a2e073ebc6c05 Mon Sep 17 00:00:00 2001 From: Dario Casalinuovo Date: Fri, 3 Jun 2016 22:42:42 +0200 Subject: [PATCH] Style fixes --- .../http_streamer/HTTPStreamerPlugin.h | 6 ++- .../media/plugins/rtsp_streamer/Jamfile | 8 +-- .../media/plugins/rtsp_streamer/RTSPMediaIO.h | 53 ++++++++++--------- .../rtsp_streamer/RTSPStreamerPlugin.h | 3 +- .../media/plugins/rtsp_streamer/rtsp.cpp | 52 +++++++++--------- 5 files changed, 62 insertions(+), 60 deletions(-) diff --git a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h index 47be819224..bb879c6cf8 100644 --- a/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h +++ b/src/add-ons/media/plugins/http_streamer/HTTPStreamerPlugin.h @@ -8,7 +8,8 @@ #include "StreamerPlugin.h" -class HTTPStreamer : public Streamer { +class HTTPStreamer : public Streamer +{ public: HTTPStreamer(); virtual ~HTTPStreamer(); @@ -17,7 +18,8 @@ public: }; -class HTTPStreamerPlugin : public StreamerPlugin { +class HTTPStreamerPlugin : public StreamerPlugin +{ public: virtual Streamer* NewStreamer(); }; diff --git a/src/add-ons/media/plugins/rtsp_streamer/Jamfile b/src/add-ons/media/plugins/rtsp_streamer/Jamfile index 54dad62ad7..391d7b051d 100644 --- a/src/add-ons/media/plugins/rtsp_streamer/Jamfile +++ b/src/add-ons/media/plugins/rtsp_streamer/Jamfile @@ -12,10 +12,10 @@ for architectureObject in [ MultiArchSubDirSetup ] { UseBuildFeatureHeaders live555 ; Includes [ FGristFiles - rtsp.cpp - RTSPStreamerPlugin.cpp - RTSPMediaIO.cpp ] - : [ BuildFeatureAttribute live555 : headers ] ; + rtsp.cpp + RTSPStreamerPlugin.cpp + RTSPMediaIO.cpp ] + : [ BuildFeatureAttribute live555 : headers ] ; Addon [ MultiArchDefaultGristFiles rtsp_streamer ] : RTSPStreamerPlugin.cpp diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h b/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h index 630c64cf05..097c06304b 100644 --- a/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h +++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h @@ -15,53 +15,54 @@ class RTSPMediaIO : public BAdapterIO { public: - RTSPMediaIO(BUrl* ourUrl); - virtual ~RTSPMediaIO(); + RTSPMediaIO(BUrl* ourUrl); + virtual ~RTSPMediaIO(); - status_t InitCheck() const; + status_t InitCheck() const; - virtual ssize_t WriteAt(off_t position, const void* buffer, - size_t size); + virtual ssize_t WriteAt(off_t position, + const void* buffer, + size_t size); private: - BUrl* fUrl; + BUrl* fUrl; - TaskScheduler* fScheduler; - UsageEnvironment* fEnv; - char loopWatchVariable; + TaskScheduler* fScheduler; + UsageEnvironment* fEnv; + char loopWatchVariable; - status_t fInitErr; + status_t fInitErr; }; class HaikuRTSPClient : public RTSPClient { public: - HaikuRTSPClient(UsageEnvironment& env, - char const* rtspURL, - portNumBits tunnelOverHTTPPortNum, - BInputAdapter* fInputAdapter); + HaikuRTSPClient(UsageEnvironment& env, + char const* rtspURL, + portNumBits tunnelOverHTTPPortNum, + BInputAdapter* fInputAdapter); - BInputAdapter* GetInputAdapter() const; + BInputAdapter* GetInputAdapter() const; - status_t WaitForInit(bigtime_t timeout); + status_t WaitForInit(bigtime_t timeout); - void NotifyError(); - void NotifySucces(); + void NotifyError(); + void NotifySucces(); protected: - virtual ~HaikuRTSPClient(); + virtual ~HaikuRTSPClient(); public: - MediaSubsessionIterator* iter; - MediaSession* session; - MediaSubsession* subsession; - TaskToken streamTimerTask; - double duration; + MediaSubsessionIterator* iter; + MediaSession* session; + MediaSubsession* subsession; + TaskToken streamTimerTask; + double duration; private: - BInputAdapter* fInputAdapter; - port_id fInitPort; + BInputAdapter* fInputAdapter; + port_id fInitPort; }; #endif diff --git a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h index eb743be59a..5ec8b01f5e 100644 --- a/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h +++ b/src/add-ons/media/plugins/rtsp_streamer/RTSPStreamerPlugin.h @@ -3,7 +3,8 @@ #include "StreamerPlugin.h" -class RTSPStreamer : public Streamer { +class RTSPStreamer : public Streamer +{ public: RTSPStreamer(); virtual ~RTSPStreamer(); diff --git a/src/add-ons/media/plugins/rtsp_streamer/rtsp.cpp b/src/add-ons/media/plugins/rtsp_streamer/rtsp.cpp index afe935e30b..d9ffc6476b 100644 --- a/src/add-ons/media/plugins/rtsp_streamer/rtsp.cpp +++ b/src/add-ons/media/plugins/rtsp_streamer/rtsp.cpp @@ -43,39 +43,39 @@ UsageEnvironment& operator<<(UsageEnvironment& env, class AdapterSink : public MediaSink { public: - static AdapterSink* createNew(UsageEnvironment& env, - MediaSubsession& subsession, - BInputAdapter* inputAdapter, - char const* streamId = NULL); + static AdapterSink* createNew(UsageEnvironment& env, + MediaSubsession& subsession, + BInputAdapter* inputAdapter, + char const* streamId = NULL); private: - AdapterSink(UsageEnvironment& env, - MediaSubsession& subsession, - char const* streamId, - BInputAdapter* inputAdapter); + AdapterSink(UsageEnvironment& env, + MediaSubsession& subsession, + char const* streamId, + BInputAdapter* inputAdapter); - virtual ~AdapterSink(); + virtual ~AdapterSink(); - static void afterGettingFrame(void* clientData, - unsigned frameSize, - unsigned numTruncatedBytes, - struct timeval presentationTime, - unsigned durationInMicroseconds); + static void afterGettingFrame(void* clientData, + unsigned frameSize, + unsigned numTruncatedBytes, + struct timeval presentationTime, + unsigned durationInMicroseconds); - void afterGettingFrame(unsigned frameSize, - unsigned numTruncatedBytes, - struct timeval presentationTime, - unsigned durationInMicroseconds); + void afterGettingFrame(unsigned frameSize, + unsigned numTruncatedBytes, + struct timeval presentationTime, + unsigned durationInMicroseconds); private: // redefined virtual functions: - virtual Boolean continuePlaying(); + virtual Boolean continuePlaying(); private: - BInputAdapter* fInputAdapter; - u_int8_t* fReceiveBuffer; - MediaSubsession& fSubsession; - char* fStreamId; + BInputAdapter* fInputAdapter; + u_int8_t* fReceiveBuffer; + MediaSubsession& fSubsession; + char* fStreamId; }; // Implementation of the RTSP 'response handlers': @@ -174,8 +174,7 @@ void setupNextSubsession(RTSPClient* rtspClient) // so send an appropriate "PLAY" command: rtspClient->sendPlayCommand(*client->session, continueAfterPLAY, client->session->absStartTime(), client->session->absEndTime()); - } - else { + } else { client->duration = client->session->playEndTime() - client->session->playStartTime(); rtspClient->sendPlayCommand(*client->session, continueAfterPLAY); @@ -201,8 +200,7 @@ void continueAfterSETUP(RTSPClient* rtspClient, << *client->subsession << "\" subsession ("; if (client->subsession->rtcpIsMuxed()) { env << "client port " << client->subsession->clientPortNum(); - } - else { + } else { env << "client ports " << client->subsession->clientPortNum() << "-" << client->subsession->clientPortNum() + 1; }