From b3d4020a37f249a353e425b0000d41606e756e57 Mon Sep 17 00:00:00 2001
From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Sat, 9 Jan 2010 20:26:34 +0100
Subject: add Accessors for pts in cFixedLengthFrame

---
 dxr3interface.c    |  2 +-
 dxr3output-audio.c |  2 +-
 dxr3output-video.c |  2 +-
 dxr3syncbuffer.c   | 18 +++---------------
 dxr3syncbuffer.h   |  9 +++------
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/dxr3interface.c b/dxr3interface.c
index 2f2ec90..258e33f 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -296,7 +296,7 @@ void cDxr3Interface::PlayVideoFrame(cFixedLengthFrame* pFrame)
     Unlock();
 
     SetAspectRatio(pFrame->aspectratio());
-    uint32_t pts = pFrame->GetPts();
+    uint32_t pts = pFrame->pts();
     if (pts > 0)
         m_lastSeenPts = pts;
 }
diff --git a/dxr3output-audio.c b/dxr3output-audio.c
index fcb5295..7c8fcab 100644
--- a/dxr3output-audio.c
+++ b/dxr3output-audio.c
@@ -50,7 +50,7 @@ void cDxr3AudioOutThread::Action()
 	pts = 0;
 	cFixedLengthFrame* pNext = m_buffer.Get();
 
-	if (pNext) pts = pNext->GetPts();
+        if (pNext) pts = pNext->pts();
 
 	if ((pts && abs((int)pts-(int)SCR) > 30000))
 	{
diff --git a/dxr3output-video.c b/dxr3output-video.c
index 17ae7f3..afebab9 100644
--- a/dxr3output-video.c
+++ b/dxr3output-video.c
@@ -45,7 +45,7 @@ void cDxr3VideoOutThread::Action()
 	cFixedLengthFrame* pNext = m_buffer.Get();
 	if (pNext)
 	{
-	    pts = pNext->GetPts();
+            pts = pNext->pts();
 	    if (pts == lastPts)
 		pts = 0;
 
diff --git a/dxr3syncbuffer.c b/dxr3syncbuffer.c
index 180cb55..33843a2 100644
--- a/dxr3syncbuffer.c
+++ b/dxr3syncbuffer.c
@@ -54,7 +54,7 @@ void cFixedLengthFrame::Init(uint32_t lenght)
 }
 
 // ==================================
-void cFixedLengthFrame::CopyFrame(const uint8_t* pStart, int length, uint32_t pts)
+void cFixedLengthFrame::CopyFrame(const uint8_t* pStart, int length)
 {
     if (length > m_length) {
         delete[] m_pData;
@@ -62,7 +62,6 @@ void cFixedLengthFrame::CopyFrame(const uint8_t* pStart, int length, uint32_t pt
         m_length = length;
     }
     m_count = length;
-    m_pts = pts;
     memcpy((void*) m_pData, (void*) pStart, length);
 }
 
@@ -78,18 +77,6 @@ int cFixedLengthFrame::GetCount(void)
     return m_count;
 }
 
-// ==================================
-uint32_t cFixedLengthFrame::GetPts(void)
-{
-    return m_pts;
-}
-
-// ==================================
-void cFixedLengthFrame::SetPts(uint32_t pts)
-{
-    m_pts = pts;
-}
-
 // ==================================
 //! constructor
 cDxr3SyncBuffer::cDxr3SyncBuffer(int frameCount, int frameLength) :
@@ -200,7 +187,8 @@ cFixedLengthFrame* cDxr3SyncBuffer::Push(const uint8_t* pStart, int length, uint
     }
 
     lastIndex = m_nextFree;
-    m_pBuffer[m_nextFree].CopyFrame(pStart, length, pts);
+    m_pBuffer[m_nextFree].CopyFrame(pStart, length);
+    m_pBuffer[m_nextFree].pts(pts);
     m_pBuffer[m_nextFree].channels(UNKNOWN_CHANNEL_COUNT);
     m_pBuffer[m_nextFree].samplerate(UNKNOWN_DATA_RATE);
     m_pBuffer[m_nextFree].aspectratio(UNKNOWN_ASPECT_RATIO);
diff --git a/dxr3syncbuffer.h b/dxr3syncbuffer.h
index d14bba7..9b84abd 100644
--- a/dxr3syncbuffer.h
+++ b/dxr3syncbuffer.h
@@ -38,29 +38,26 @@ const uint32_t UNKNOWN_ASPECT_RATIO = 0xFFFFFFFF;
 class cFixedLengthFrame : private Uncopyable {
 public:
     cFixedLengthFrame() : samplerate(UNKNOWN_DATA_RATE), channels(UNKNOWN_CHANNEL_COUNT), aspectratio(UNKNOWN_ASPECT_RATIO),
-                          m_count(0), m_length(0), m_pts(0)
+                          pts(0), m_count(0), m_length(0)
     {}
 
     ~cFixedLengthFrame();
 
     void Init(uint32_t lenght);
 
-    void CopyFrame(const uint8_t* pStart, int length, uint32_t pts);
+    void CopyFrame(const uint8_t* pStart, int length);
     uint8_t* GetData(void);
     int GetCount(void);
-    uint32_t GetPts(void);
-    void SetPts(uint32_t pts);
 
     Accessors<uint32_t> samplerate;
     Accessors<uint32_t> channels;
     Accessors<uint32_t> aspectratio;
-
+    Accessors<uint32_t> pts;
 
 private:
     uint8_t* m_pData;
     int m_count;
     int m_length;
-    uint32_t m_pts;
 };
 
 // ==================================
-- 
cgit v1.2.3