add prefix to plugin specific class names

9 files changed, 39 insertions, 39 deletions

diff --git a/audio.c b/audio.c
index c2d97f4..7548ecf 100644
--- a/audio.c
+++ b/audio.c
@@ -16,7 +16,7 @@
 
 #define AVPKT_BUFFER_SIZE (KILOBYTE(256))
 
-class cAudioDecoder::cParser
+class cRpiAudioDecoder::cParser
 {
 
 public:
@@ -619,7 +619,7 @@ private:
 ///
 ///	BitRateTable[Version][Layer][Index]
 ///
-const uint16_t cAudioDecoder::cParser::BitRateTable[2][3][16] =
+const uint16_t cRpiAudioDecoder::cParser::BitRateTable[2][3][16] =
 {
 	{	// MPEG Version 1
 		{0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0},
@@ -636,13 +636,13 @@ const uint16_t cAudioDecoder::cParser::BitRateTable[2][3][16] =
 ///
 ///	MPEG sample rate table.
 ///
-const uint16_t cAudioDecoder::cParser::MpegSampleRateTable[4] =
+const uint16_t cRpiAudioDecoder::cParser::MpegSampleRateTable[4] =
 	{ 44100, 48000, 32000, 0 };
 
 ///
 ///	MPEG-4 sample rate table.
 ///
-const uint32_t cAudioDecoder::cParser::Mpeg4SampleRateTable[16] = {
+const uint32_t cRpiAudioDecoder::cParser::Mpeg4SampleRateTable[16] = {
 		96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
 		16000, 12000, 11025,  8000,  7350,     0,     0,     0
 };
@@ -650,7 +650,7 @@ const uint32_t cAudioDecoder::cParser::Mpeg4SampleRateTable[16] = {
 ///
 ///	AC-3 sample rate table.
 ///
-const uint16_t cAudioDecoder::cParser::Ac3SampleRateTable[4] =
+const uint16_t cRpiAudioDecoder::cParser::Ac3SampleRateTable[4] =
 	{ 48000, 44100, 32000, 0 };
 
 ///
@@ -658,7 +658,7 @@ const uint16_t cAudioDecoder::cParser::Ac3SampleRateTable[4] =
 ///
 ///	from ATSC A/52 table 5.18 frame size code table.
 ///
-const uint16_t cAudioDecoder::cParser::Ac3FrameSizeTable[38][3] =
+const uint16_t cRpiAudioDecoder::cParser::Ac3FrameSizeTable[38][3] =
 {
 	{  64,   69,   96}, {  64,   70,   96}, {  80,   87,  120}, { 80,  88,  120},
 	{  96,  104,  144}, {  96,  105,  144}, { 112,  121,  168}, {112, 122,  168},
@@ -674,7 +674,7 @@ const uint16_t cAudioDecoder::cParser::Ac3FrameSizeTable[38][3] =
 
 /* ------------------------------------------------------------------------- */
 
-cAudioDecoder::cAudioDecoder(cOmx *omx) :
+cRpiAudioDecoder::cRpiAudioDecoder(cOmx *omx) :
 	cThread(),
 	m_passthrough(false),
 	m_reset(false),
@@ -684,13 +684,13 @@ cAudioDecoder::cAudioDecoder(cOmx *omx) :
 {
 }
 
-cAudioDecoder::~cAudioDecoder()
+cRpiAudioDecoder::~cRpiAudioDecoder()
 {
 	delete m_parser;
 	delete m_wait;
 }
 
-int cAudioDecoder::Init(void)
+int cRpiAudioDecoder::Init(void)
 {
 	int ret = m_parser->Init();
 	if (ret)
@@ -733,7 +733,7 @@ int cAudioDecoder::Init(void)
 	return ret;
 }
 
-int cAudioDecoder::DeInit(void)
+int cRpiAudioDecoder::DeInit(void)
 {
 	Lock();
 
@@ -760,7 +760,7 @@ int cAudioDecoder::DeInit(void)
 	return 0;
 }
 
-bool cAudioDecoder::WriteData(const unsigned char *buf, unsigned int length,
+bool cRpiAudioDecoder::WriteData(const unsigned char *buf, unsigned int length,
 		uint64_t pts)
 {
 	Lock();
@@ -773,7 +773,7 @@ bool cAudioDecoder::WriteData(const unsigned char *buf, unsigned int length,
 	return ret;
 }
 
-void cAudioDecoder::Reset(void)
+void cRpiAudioDecoder::Reset(void)
 {
 	Lock();
 
@@ -785,12 +785,12 @@ void cAudioDecoder::Reset(void)
 	Unlock();
 }
 
-bool cAudioDecoder::Poll(void)
+bool cRpiAudioDecoder::Poll(void)
 {
 	return m_parser->GetFreeSpace() > KILOBYTE(16);
 }
 
-void cAudioDecoder::Action(void)
+void cRpiAudioDecoder::Action(void)
 {
 	DLOG("cAudioDecoder() thread started");
 
@@ -955,7 +955,7 @@ void cAudioDecoder::Action(void)
 	DLOG("cAudioDecoder() thread ended");
 }
 
-void cAudioDecoder::SetCodec(cAudioCodec::eCodec codec, unsigned int &channels, unsigned int samplingRate)
+void cRpiAudioDecoder::SetCodec(cAudioCodec::eCodec codec, unsigned int &channels, unsigned int samplingRate)
 {
 	m_omx->StopAudio();
 
@@ -969,12 +969,12 @@ void cAudioDecoder::SetCodec(cAudioCodec::eCodec codec, unsigned int &channels,
 
 		m_passthrough = false;
 		cAudioCodec::eCodec outputFormat = cAudioCodec::ePCM;
-		cAudioPort::ePort outputPort = cAudioPort::eLocal;
+		cRpiAudioPort::ePort outputPort = cRpiAudioPort::eLocal;
 
-		if (cRpiSetup::GetAudioPort() == cAudioPort::eHDMI &&
+		if (cRpiSetup::GetAudioPort() == cRpiAudioPort::eHDMI &&
 			cRpiSetup::IsAudioFormatSupported(cAudioCodec::ePCM, channels, samplingRate))
 		{
-			outputPort = cAudioPort::eHDMI;
+			outputPort = cRpiAudioPort::eHDMI;
 
 			if (cRpiSetup::IsAudioPassthrough() &&
 				cRpiSetup::IsAudioFormatSupported(codec, channels, samplingRate))
@@ -990,14 +990,14 @@ void cAudioDecoder::SetCodec(cAudioCodec::eCodec codec, unsigned int &channels,
 			channels = 2;
 
 			// if 2ch PCM audio on HDMI is supported
-			if (cRpiSetup::GetAudioPort() == cAudioPort::eHDMI &&
+			if (cRpiSetup::GetAudioPort() == cRpiAudioPort::eHDMI &&
 				cRpiSetup::IsAudioFormatSupported(cAudioCodec::ePCM, 2, samplingRate))
-				outputPort = cAudioPort::eHDMI;
+				outputPort = cRpiAudioPort::eHDMI;
 		}
 
 		m_omx->SetupAudioRender(outputFormat, channels,	outputPort, samplingRate);
 		ILOG("set %s audio output format to %dch %s, %d.%dkHz%s",
-				cAudioPort::Str(outputPort), channels, cAudioCodec::Str(outputFormat),
+				cRpiAudioPort::Str(outputPort), channels, cAudioCodec::Str(outputFormat),
 				samplingRate / 1000, (samplingRate % 1000) / 100,
 				m_passthrough ? " (pass-through)" : "");
 	}
diff --git a/audio.h b/audio.h
index 42a63ba..cf57dba 100644
--- a/audio.h
+++ b/audio.h
@@ -16,13 +16,13 @@ extern "C" {
 #include "tools.h"
 #include "omx.h"
 
-class cAudioDecoder : public cThread
+class cRpiAudioDecoder : public cThread
 {
 
 public:
 
-    cAudioDecoder(cOmx *omx);
-	virtual ~cAudioDecoder();
+    cRpiAudioDecoder(cOmx *omx);
+	virtual ~cRpiAudioDecoder();
 
 	virtual int Init(void);
 	virtual int DeInit(void);
diff --git a/omx.c b/omx.c
index c7ba90d..dfeba81 100644
--- a/omx.c
+++ b/omx.c
@@ -926,7 +926,7 @@ void cOmx::SetVideoDecoderExtraBuffers(int extraBuffers)
 }
 
 int cOmx::SetupAudioRender(cAudioCodec::eCodec outputFormat, int channels,
-		cAudioPort::ePort audioPort, int samplingRate)
+		cRpiAudioPort::ePort audioPort, int samplingRate)
 {
 	OMX_AUDIO_PARAM_PORTFORMATTYPE format;
 	OMX_INIT_STRUCT(format);
@@ -1018,7 +1018,7 @@ int cOmx::SetupAudioRender(cAudioCodec::eCodec outputFormat, int channels,
 	OMX_CONFIG_BRCMAUDIODESTINATIONTYPE audioDest;
 	OMX_INIT_STRUCT(audioDest);
 	strcpy((char *)audioDest.sName,
-			audioPort == cAudioPort::eLocal ? "local" : "hdmi");
+			audioPort == cRpiAudioPort::eLocal ? "local" : "hdmi");
 
 	if (OMX_SetConfig(ILC_GET_HANDLE(m_comp[eAudioRender]),
 			OMX_IndexConfigBrcmAudioDestination, &audioDest) != OMX_ErrorNone)
diff --git a/omx.h b/omx.h
index e2e0f9e..c162a88 100644
--- a/omx.h
+++ b/omx.h
@@ -84,7 +84,7 @@ public:
 	int SetVideoCodec(cVideoCodec::eCodec codec,
 			eDataUnitType dataUnit = eArbitraryStreamSection);
 	int SetupAudioRender(cAudioCodec::eCodec outputFormat,
-			int channels, cAudioPort::ePort audioPort, int samplingRate = 0);
+			int channels, cRpiAudioPort::ePort audioPort, int samplingRate = 0);
 	void GetVideoSize(int &width, int &height, bool &interlaced);
 
 	void SetDisplayMode(bool letterbox, bool noaspect);
diff --git a/omxdevice.c b/omxdevice.c
index 76aa89d..fec8cfd 100644
--- a/omxdevice.c
+++ b/omxdevice.c
@@ -39,7 +39,7 @@ cOmxDevice::cOmxDevice(void (*onPrimaryDevice)(void)) :
 	cDevice(),
 	m_onPrimaryDevice(onPrimaryDevice),
 	m_omx(new cOmx()),
-	m_audio(new cAudioDecoder(m_omx)),
+	m_audio(new cRpiAudioDecoder(m_omx)),
 	m_mutex(new cMutex()),
 	m_videoCodec(cVideoCodec::eInvalid),
 	m_speed(eNormal),
diff --git a/omxdevice.h b/omxdevice.h
index 2b890a3..ea2672c 100644
--- a/omxdevice.h
+++ b/omxdevice.h
@@ -12,7 +12,7 @@
 #include "tools.h"
 
 class cOmx;
-class cAudioDecoder;
+class cRpiAudioDecoder;
 class cMutex;
 
 class cOmxDevice : cDevice
@@ -143,9 +143,9 @@ private:
 
 	void UpdateLatency(int64_t pts);
 
-	cOmx			*m_omx;
-	cAudioDecoder	*m_audio;
-	cMutex			*m_mutex;
+	cOmx			 *m_omx;
+	cRpiAudioDecoder *m_audio;
+	cMutex			 *m_mutex;
 
 	cVideoCodec::eCodec	m_videoCodec;
 
diff --git a/setup.c b/setup.c
index 9cf28d2..70842e1 100644
--- a/setup.c
+++ b/setup.c
@@ -139,7 +139,7 @@ bool cRpiSetup::HwInit(void)
 
 	int height = 0, width = 0;
 	bool progressive = false;
-	cVideoPort::ePort port = cVideoPort::eComposite;
+	cRpiVideoPort::ePort port = cRpiVideoPort::eComposite;
 
 	TV_DISPLAY_STATE_T tvstate;
 	memset(&tvstate, 0, sizeof(TV_DISPLAY_STATE_T));
@@ -151,7 +151,7 @@ bool cRpiSetup::HwInit(void)
 			progressive = tvstate.display.hdmi.scan_mode == 0;
 			height = tvstate.display.hdmi.height;
 			width = tvstate.display.hdmi.width;
-			port = cVideoPort::eHDMI;
+			port = cRpiVideoPort::eHDMI;
 		}
 		else
 		{
@@ -160,7 +160,7 @@ bool cRpiSetup::HwInit(void)
 		}
 
 		ILOG("using %s video output at %dx%d%s",
-				cVideoPort::Str(port), width, height, progressive ? "p" : "i");
+				cRpiVideoPort::Str(port), width, height, progressive ? "p" : "i");
 
 		instance->m_isProgressive = progressive;
 		instance->m_displayHeight = height;
diff --git a/setup.h b/setup.h
index da6c697..3199edb 100644
--- a/setup.h
+++ b/setup.h
@@ -17,8 +17,8 @@ public:
 
 	static bool HwInit(void);
 
-	static cAudioPort::ePort GetAudioPort(void) {
-		return (GetInstance()->m_audioPort) ? cAudioPort::eHDMI : cAudioPort::eLocal; }
+	static cRpiAudioPort::ePort GetAudioPort(void) {
+		return (GetInstance()->m_audioPort) ? cRpiAudioPort::eHDMI : cRpiAudioPort::eLocal; }
 
 	static bool IsAudioPassthrough(void) {
 		return GetInstance()->m_passthrough; }
diff --git a/tools.h b/tools.h
index e5a2b6d..293731e 100644
--- a/tools.h
+++ b/tools.h
@@ -57,7 +57,7 @@ public:
 	}
 };
 
-class cAudioPort
+class cRpiAudioPort
 {
 public:
 
@@ -72,7 +72,7 @@ public:
 	}
 };
 
-class cVideoPort
+class cRpiVideoPort
 {
 public: