Mass indentation/whitespace cleanup.

1 files changed, 31 insertions, 19 deletions

diff --git a/dxr3demuxdevice.h b/dxr3demuxdevice.h
index fdd1942..ebccaae 100644
--- a/dxr3demuxdevice.h
+++ b/dxr3demuxdevice.h
@@ -37,10 +37,10 @@ const uint32_t PRE_BUFFER_LENGTH = 0;
 
 // ==================================
 // extract video and audio
-class cDxr3DemuxDevice 
+class cDxr3DemuxDevice
 {
 public:
-	cDxr3DemuxDevice();
+    cDxr3DemuxDevice();
     cDxr3DemuxDevice(cDxr3Interface& dxr3Device);
     ~cDxr3DemuxDevice();
 
@@ -55,31 +55,43 @@ public:
     void SetReplayMode(void);
     void SetTrickMode(eDxr3TrickState trickState, int Speed = 1);
 
-	#if VDRVERSNUM < 10307
+#if VDRVERSNUM < 10307
     cOsdBase* NewOsd(int x, int y);
-	#endif
+#endif
 
     int DemuxPes(const uint8_t* buf, int length, bool bAc3Dts = false);
     int DemuxAudioPes(const uint8_t* buf, int length);
     void StillPicture(const uint8_t* buf, int length);
 
-    eDxr3DemuxMode GetDemuxMode(void) { return m_demuxMode;};
-    eDxr3TrickState GetTrickState(void) { return m_trickState;};
-    bool Poll(int TimeoutMs){ return  m_aBuf.Poll(TimeoutMs) && m_vBuf.Poll(TimeoutMs); };
-    // { return  m_demuxMode == DXR3_DEMUX_AUDIO_ONLY_MODE ? m_aBuf.Poll(TimeoutMs) : m_aBuf.Poll(TimeoutMs); };
+    eDxr3DemuxMode GetDemuxMode(void)
+    {
+	return m_demuxMode;
+    };
+    eDxr3TrickState GetTrickState(void)
+    {
+	return m_trickState;
+    };
+    bool Poll(int TimeoutMs)
+    {
+	return  m_aBuf.Poll(TimeoutMs) && m_vBuf.Poll(TimeoutMs);
+	/*
+	return  m_demuxMode == DXR3_DEMUX_AUDIO_ONLY_MODE ?
+	    m_aBuf.Poll(TimeoutMs) : m_aBuf.Poll(TimeoutMs);
+	*/
+    };
 
 protected:
-    cDxr3Interface&			m_dxr3Device;
-    cDxr3SyncBuffer			m_aBuf;
-    cDxr3SyncBuffer			m_vBuf;
-    eDxr3DemuxSynchState	m_synchState;
-    eDxr3DemuxMode			m_demuxMode;
-    eDxr3TrickState			m_trickState;
-    cDxr3AudioDecoder		m_aDecoder;
-    cDxr3AudioOutThread*	m_pAudioThread;
-    cDxr3VideoOutThread*	m_pVideoThread;
-    uint32_t				m_stopScr;
-	int						m_ReUseFrame;	// how often a frame should be used
+    cDxr3Interface& m_dxr3Device;
+    cDxr3SyncBuffer m_aBuf;
+    cDxr3SyncBuffer m_vBuf;
+    eDxr3DemuxSynchState m_synchState;
+    eDxr3DemuxMode m_demuxMode;
+    eDxr3TrickState m_trickState;
+    cDxr3AudioDecoder m_aDecoder;
+    cDxr3AudioOutThread* m_pAudioThread;
+    cDxr3VideoOutThread* m_pVideoThread;
+    uint32_t m_stopScr;
+    int m_ReUseFrame;			// how often a frame should be used
 
 private:
     cDxr3DemuxDevice(cDxr3DemuxDevice&); // no copy constructor