From 81fa5e8026ff743d8d38407bdd0bd93b0eb89229 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <mauricek@nowhere.fake>
Date: Sat, 29 Mar 2008 19:11:58 +0000
Subject: [PATCH] * Adding LoggingConsumer to build, which is a demo addon
 provided by Be and included into Cortex once * This is the first Addon inside
 Haiku which uses StartControlPanel(), which will be submitted later on. *
 Cleaned up warnings

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24664 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/cortex/addons/Jamfile                    |  1 +
 src/apps/cortex/addons/LoggingConsumer/Jamfile    | 15 +++++++++++++++
 .../cortex/addons/LoggingConsumer/LogWriter.h     |  2 +-
 .../addons/LoggingConsumer/LoggingConsumer.cpp    |  4 ++--
 .../LoggingConsumer/LoggingConsumerAddOn.cpp      |  2 +-
 .../addons/LoggingConsumer/LoggingConsumerApp.cpp |  2 +-
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 src/apps/cortex/addons/LoggingConsumer/Jamfile

diff --git a/src/apps/cortex/addons/Jamfile b/src/apps/cortex/addons/Jamfile
index 73ba7f5187..59c54ba7f1 100644
--- a/src/apps/cortex/addons/Jamfile
+++ b/src/apps/cortex/addons/Jamfile
@@ -4,4 +4,5 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 SubInclude HAIKU_TOP src apps cortex addons AudioAdapter ;
 SubInclude HAIKU_TOP src apps cortex addons Flanger ;
+SubInclude HAIKU_TOP src apps cortex addons LoggingConsumer ;
 
diff --git a/src/apps/cortex/addons/LoggingConsumer/Jamfile b/src/apps/cortex/addons/LoggingConsumer/Jamfile
new file mode 100644
index 0000000000..1fa2834031
--- /dev/null
+++ b/src/apps/cortex/addons/LoggingConsumer/Jamfile
@@ -0,0 +1,15 @@
+SubDir HAIKU_TOP src apps cortex addons LoggingConsumer ;
+
+SubDirHdrs [ FDirName $(HAIKU_TOP) src apps cortex addons common ] ;
+SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps cortex addons common ] ;
+
+Application cortex_logging_consumer.media_addon :
+	LoggingConsumerApp.cpp
+	LoggingConsumerAddOn.cpp
+	MediaNodeControlApp.cpp
+	NodeHarnessApp.cpp
+	NodeHarnessWin.cpp
+	LogWriter.cpp
+	LoggingConsumer.cpp
+	: be media
+;
diff --git a/src/apps/cortex/addons/LoggingConsumer/LogWriter.h b/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
index 415b9d8430..e21842db44 100644
--- a/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
+++ b/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
@@ -105,7 +105,7 @@ class LogWriter
 {
 public:
 	// Set:  output for the log_what members is disabled
-	typedef set<log_what> FilterSet;
+	typedef std::set<log_what> FilterSet;
 
 public:
 	LogWriter(const entry_ref& logRef);
diff --git a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
index a986d81ee7..327a6719d9 100644
--- a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
+++ b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
@@ -66,7 +66,6 @@ LoggingConsumer::LoggingConsumer(
 		BBufferConsumer(B_MEDIA_UNKNOWN_TYPE),
 		BControllable(),
 		BMediaEventLooper(),
-		m_pAddOn(pAddOn),
 		mLogRef(logFile),
 		mWeb(NULL),
 		mLateBuffers(0),
@@ -75,7 +74,8 @@ LoggingConsumer::LoggingConsumer(
 		mPriority(B_URGENT_DISPLAY_PRIORITY),		// !!! testing; will be B_REAL_TIME_PRIORITY for release
 		mLastLatencyChange(0),
 		mLastSpinChange(0),
-		mLastPrioChange(0)
+		mLastPrioChange(0),
+		m_pAddOn(pAddOn)
 {
 	// spin off the logging thread
 	mLogger = new LogWriter(logFile);
diff --git a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
index b919d6960c..6214ada8a2 100644
--- a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
+++ b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
@@ -94,4 +94,4 @@ status_t LoggingConsumerAddOn::GetConfigurationFor(
 	return B_OK;
 }
 
-// END -- LoggingConsumerAddOn.cpp
\ No newline at end of file
+// END -- LoggingConsumerAddOn.cpp
diff --git a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
index d5c23a1b3c..6cc67f456b 100644
--- a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
+++ b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
@@ -27,4 +27,4 @@ int main(int argc, char** argv) {
 	return 0;
 }
 
-// END -- LoggingConsumerApp.cpp --
\ No newline at end of file
+// END -- LoggingConsumerApp.cpp --