Style fixes

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();
 };

src/add-ons/media/plugins/rtsp_streamer/Jamfile

@@ -12,10 +12,10 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		UseBuildFeatureHeaders live555 ;
 
 		Includes [ FGristFiles
-				rtsp.cpp
+			rtsp.cpp
-				RTSPStreamerPlugin.cpp
+			RTSPStreamerPlugin.cpp
-				RTSPMediaIO.cpp ]
+			RTSPMediaIO.cpp ]
-			: [ BuildFeatureAttribute live555 : headers ] ;
+		: [ BuildFeatureAttribute live555 : headers ] ;
 
 		Addon [ MultiArchDefaultGristFiles rtsp_streamer ] :
 			RTSPStreamerPlugin.cpp

src/add-ons/media/plugins/rtsp_streamer/RTSPMediaIO.h

@@ -15,53 +15,54 @@
 class RTSPMediaIO : public BAdapterIO
 {
 public:
-								RTSPMediaIO(BUrl* ourUrl);
+										RTSPMediaIO(BUrl* ourUrl);
-	virtual						~RTSPMediaIO();
+	virtual								~RTSPMediaIO();
 
-			status_t			InitCheck() const;
+			status_t					InitCheck() const;
 
-	virtual	ssize_t				WriteAt(off_t position, const void* buffer,
+	virtual	ssize_t						WriteAt(off_t position,
-									size_t size);
+											const void* buffer,
+											size_t size);
 private:
-	BUrl*						fUrl;
+			BUrl*						fUrl;
 
-	TaskScheduler*				fScheduler;
+			TaskScheduler*				fScheduler;
-	UsageEnvironment*			fEnv;
+			UsageEnvironment*			fEnv;
-	char						loopWatchVariable;
+			char						loopWatchVariable;
 
-	status_t					fInitErr;
+			status_t					fInitErr;
 };
 
 
 class HaikuRTSPClient : public RTSPClient
 {
 public:
-								HaikuRTSPClient(UsageEnvironment& env,
+										HaikuRTSPClient(UsageEnvironment& env,
-									char const* rtspURL,
+											char const* rtspURL,
-									portNumBits tunnelOverHTTPPortNum,
+											portNumBits tunnelOverHTTPPortNum,
-									BInputAdapter* fInputAdapter);
+											BInputAdapter* fInputAdapter);
 
-			BInputAdapter*		GetInputAdapter() const;
+			BInputAdapter*				GetInputAdapter() const;
 
-			status_t			WaitForInit(bigtime_t timeout);
+			status_t					WaitForInit(bigtime_t timeout);
 
-			void				NotifyError();
+			void						NotifyError();
-			void				NotifySucces();
+			void						NotifySucces();
 
 protected:
-	virtual 					~HaikuRTSPClient();
+	virtual 							~HaikuRTSPClient();
 
 public:
 
-	MediaSubsessionIterator* 	iter;
+			MediaSubsessionIterator* 	iter;
-	MediaSession*				session;
+			MediaSession*				session;
-	MediaSubsession*			subsession;
+			MediaSubsession*			subsession;
-	TaskToken					streamTimerTask;
+			TaskToken					streamTimerTask;
-	double						duration;
+			double						duration;
 
 private:
-			BInputAdapter*		fInputAdapter;
+			BInputAdapter*				fInputAdapter;
-			port_id				fInitPort;
+			port_id						fInitPort;
 };
 
 #endif

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();

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,
+			static	 			AdapterSink* createNew(UsageEnvironment& env,
-								MediaSubsession& subsession,
+									MediaSubsession& subsession,
-								BInputAdapter* inputAdapter,
+									BInputAdapter* inputAdapter,
-								char const* streamId = NULL);
+									char const* streamId = NULL);
 
 private:
-							AdapterSink(UsageEnvironment& env,
+								AdapterSink(UsageEnvironment& env,
-								MediaSubsession& subsession,
+									MediaSubsession& subsession,
-								char const* streamId,
+									char const* streamId,
-								BInputAdapter* inputAdapter);
+									BInputAdapter* inputAdapter);
 
-	virtual 				~AdapterSink();
+	virtual 					~AdapterSink();
 
-			static void		afterGettingFrame(void* clientData,
+			static void			afterGettingFrame(void* clientData,
-								unsigned frameSize,
+									unsigned frameSize,
-								unsigned numTruncatedBytes,
+									unsigned numTruncatedBytes,
-								struct timeval presentationTime,
+									struct timeval presentationTime,
-								unsigned durationInMicroseconds);
+									unsigned durationInMicroseconds);
 
-			void			afterGettingFrame(unsigned frameSize,
+			void				afterGettingFrame(unsigned frameSize,
-								unsigned numTruncatedBytes,
+									unsigned numTruncatedBytes,
-								struct timeval presentationTime,
+									struct timeval presentationTime,
-								unsigned durationInMicroseconds);
+									unsigned durationInMicroseconds);
 
 private:
 	// redefined virtual functions:
-	virtual Boolean			continuePlaying();
+	virtual Boolean				continuePlaying();
 
 private:
-	BInputAdapter*			fInputAdapter;
+			BInputAdapter*		fInputAdapter;
-	u_int8_t*				fReceiveBuffer;
+			u_int8_t*			fReceiveBuffer;
-	MediaSubsession&		fSubsession;
+			MediaSubsession&	fSubsession;
-	char*					fStreamId;
+			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;
 		}