refactoring

git-svn-id: svn://elaine/murooma/trunk@328 d8a302eb-03bc-478d-80e4-98257eca68ef

message/ack.h

@@ -3,19 +3,21 @@
 
 #include "message.h"
 
+namespace msg
+{
 
-class AckMsg : public BaseMessage
+class Ack : public BaseMessage
 {
 public:
-	AckMsg() : BaseMessage(message_type::ackMsg), message("")
+	Ack() : BaseMessage(message_type::kAck), message("")
 	{
 	}
 
-	AckMsg(const std::string& _message) : BaseMessage(message_type::requestmsg), message(_message)
+	Ack(const std::string& _message) : BaseMessage(message_type::kAck), message(_message)
 	{
 	}
 
-	virtual ~AckMsg()
+	virtual ~Ack()
 	{
 	}
 
@@ -43,6 +45,7 @@ protected:
 	}
 };
 
+}
 
 
 

message/command.h

@@ -5,18 +5,21 @@
 #include <string>
 
 
-class CommandMsg : public BaseMessage
+namespace msg
+{
+
+class Command : public BaseMessage
 {
 public:
-	CommandMsg() : BaseMessage(message_type::commandmsg), command("")
+	Command() : BaseMessage(message_type::kCommand), command("")
 	{
 	}
 
-	CommandMsg(const std::string& _command) : BaseMessage(message_type::commandmsg), command(_command)
+	Command(const std::string& _command) : BaseMessage(message_type::kCommand), command(_command)
 	{
 	}
 
-	virtual ~CommandMsg()
+	virtual ~Command()
 	{
 	}
 
@@ -44,7 +47,7 @@ protected:
 	}
 };
 
-
+}
 
 
 #endif

message/header.h

@@ -3,17 +3,18 @@
 
 #include "message.h"
 
+namespace msg
+{
 
-
-class HeaderMessage : public BaseMessage
+class Header : public BaseMessage
 {
 public:
-	HeaderMessage(const std::string& codecName = "", size_t size = 0) : BaseMessage(message_type::header), payloadSize(size), codec(codecName)
+	Header(const std::string& codecName = "", size_t size = 0) : BaseMessage(message_type::kHeader), payloadSize(size), codec(codecName)
 	{
 		payload = (char*)malloc(size);
 	}
 
-	virtual ~HeaderMessage()
+	virtual ~Header()
 	{
 		free(payload);
 	}
@@ -50,6 +51,7 @@ protected:
 	}
 };
 
+}
 
 
 #endif

message/message.h

@@ -30,15 +30,15 @@ struct membuf : public std::basic_streambuf<char>
 
 enum message_type
 {
-	base = 0,
-	header = 1,
-	payload = 2,
-	sampleformat = 3,
-	serversettings = 4,
-	timemsg = 5,
-	requestmsg = 6,
-	ackMsg = 7,
-	commandmsg = 8
+	kBase = 0,
+	kHeader = 1,
+	kPayload = 2,
+	kSampleFormat = 3,
+	kServerSettings = 4,
+	kTime = 5,
+	kRequest = 6,
+	kAck = 7,
+	kCommand = 8
 };
 
 
@@ -90,10 +90,12 @@ struct tv
 	}
 };
 
+namespace msg
+{
 
 struct BaseMessage
 {
-	BaseMessage() : type(base), id(0), refersTo(0)
+	BaseMessage() : type(kBase), id(0), refersTo(0)
 	{
 	}
 
@@ -181,6 +183,7 @@ struct SerializedMessage
 	char* buffer;
 };
 
+}
 
 #endif
 

message/pcmChunk.cpp

@@ -6,6 +6,8 @@
 
 using namespace std;
 
+namespace msg
+{
 
 PcmChunk::PcmChunk(const SampleFormat& sampleFormat, size_t ms) : WireChunk(sampleFormat.rate*sampleFormat.frameSize*ms / 1000), format(sampleFormat), idx(0)
 {
@@ -51,4 +53,6 @@ int PcmChunk::readFrames(void* outputBuffer, size_t frameCount)
 }
 
 
+}
+
 

message/pcmChunk.h

@@ -8,6 +8,8 @@
 #include "common/timeDefs.h"
 
 
+namespace msg
+{
 
 class PcmChunk : public WireChunk
 {
@@ -62,7 +64,7 @@ private:
 	uint32_t idx;
 };
 
-
+}
 
 #endif
 

message/request.h

@@ -4,19 +4,21 @@
 #include "message.h"
 #include <string>
 
+namespace msg
+{
 
-class RequestMsg : public BaseMessage
+class Request : public BaseMessage
 {
 public:
-	RequestMsg() : BaseMessage(message_type::requestmsg), request(base)
+	Request() : BaseMessage(message_type::kRequest), request(kBase)
 	{
 	}
 
-	RequestMsg(message_type _request) : BaseMessage(message_type::requestmsg), request(_request)
+	Request(message_type _request) : BaseMessage(message_type::kRequest), request(_request)
 	{
 	}
 
-	virtual ~RequestMsg()
+	virtual ~Request()
 	{
 	}
 
@@ -39,7 +41,7 @@ protected:
 	}
 };
 
-
+}
 
 
 #endif

message/sampleFormat.cpp

@@ -5,18 +5,21 @@
 #include <iostream>
 
 
-SampleFormat::SampleFormat() : BaseMessage(message_type::sampleformat)
+namespace msg
+{
+
+SampleFormat::SampleFormat() : BaseMessage(message_type::kSampleFormat)
 {
 }
 
 
-SampleFormat::SampleFormat(const std::string& format) : BaseMessage(message_type::sampleformat)
+SampleFormat::SampleFormat(const std::string& format) : BaseMessage(message_type::kSampleFormat)
 {
 	setFormat(format);
 }
 
 
-SampleFormat::SampleFormat(uint32_t sampleRate, uint16_t bitsPerSample, uint16_t channelCount) : BaseMessage(message_type::sampleformat)
+SampleFormat::SampleFormat(uint32_t sampleRate, uint16_t bitsPerSample, uint16_t channelCount) : BaseMessage(message_type::kSampleFormat)
 {
 	setFormat(sampleRate, bitsPerSample, channelCount);
 }
@@ -45,5 +48,7 @@ void SampleFormat::setFormat(uint32_t rate, uint16_t bits, uint16_t channels)
 	frameSize = channels*sampleSize;
 }
 
+}
+
 
 

message/sampleFormat.h

@@ -4,6 +4,8 @@
 #include <string>
 #include "message.h"
 
+namespace msg
+{
 
 class SampleFormat : public BaseMessage
 {
@@ -63,6 +65,7 @@ protected:
 
 };
 
+}
 
 #endif
 

message/serverSettings.h

@@ -4,11 +4,13 @@
 #include "message/message.h"
 
 
+namespace msg
+{
 
 class ServerSettings : public BaseMessage
 {
 public:
-	ServerSettings() : BaseMessage(message_type::serversettings)
+	ServerSettings() : BaseMessage(message_type::kServerSettings)
 	{
 	}
 
@@ -35,7 +37,7 @@ protected:
 	}
 };
 
-
+}
 
 
 #endif

message/time.h

@@ -3,15 +3,17 @@
 
 #include "message.h"
 
+namespace msg
+{
 
-class TimeMsg : public BaseMessage
+class Time : public BaseMessage
 {
 public:
-	TimeMsg() : BaseMessage(message_type::timemsg)
+	Time() : BaseMessage(message_type::kTime)
 	{
 	}
 
-	virtual ~TimeMsg()
+	virtual ~Time()
 	{
 	}
 
@@ -34,7 +36,7 @@ protected:
 	}
 };
 
-
+}
 
 
 #endif

message/wireChunk.h

@@ -10,10 +10,13 @@
 #include "message.h"
 
 
+namespace msg
+{
+
 class WireChunk : public BaseMessage
 {
 public:
-	WireChunk(size_t size = 0) : BaseMessage(message_type::payload), payloadSize(size)
+	WireChunk(size_t size = 0) : BaseMessage(message_type::kPayload), payloadSize(size)
 	{
 		payload = (char*)malloc(size);
 	}
@@ -51,7 +54,7 @@ protected:
 	}
 };
 
-
+}
 
 
 #endif