[haiku-commits] r42635 - in haiku/trunk/src/apps/cortex: addons/LoggingConsumer addons/ToneProducer addons/common support
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 14 Aug 2011 20:05:49 +0200 (CEST)
Author: mmadia
Date: 2011-08-14 20:05:48 +0200 (Sun, 14 Aug 2011)
New Revision: 42635
Changeset: https://dev.haiku-os.org/changeset/42635
Removed:
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LICENSE.Be
haiku/trunk/src/apps/cortex/addons/ToneProducer/LICENSE.Be
haiku/trunk/src/apps/cortex/addons/common/LICENSE.Be
haiku/trunk/src/apps/cortex/support/LICENSE.Be
Modified:
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.cpp
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.h
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.h
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.cpp
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.h
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.cpp
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.h
haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.cpp
haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.h
haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.cpp
haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.h
haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducer.cpp
haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducer.h
haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducerAddOn.cpp
haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducerAddOn.h
haiku/trunk/src/apps/cortex/addons/ToneProducer/main.cpp
haiku/trunk/src/apps/cortex/addons/common/SoundUtils.cpp
haiku/trunk/src/apps/cortex/addons/common/SoundUtils.h
haiku/trunk/src/apps/cortex/support/MultiInvoker.cpp
haiku/trunk/src/apps/cortex/support/MultiInvoker.h
haiku/trunk/src/apps/cortex/support/SoundUtils.cpp
haiku/trunk/src/apps/cortex/support/SoundUtils.h
haiku/trunk/src/apps/cortex/support/array_delete.h
Log:
Adjusted the copyright header, to account for Be Sample Code License and
copyrights. Automatic whitespace cleanup. No functional change.
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -145,7 +146,7 @@
//
// This method, called by the client, really just enqueues a message to the
writer thread,
// which will deal with it in the HandleMessage() method.
-void
+void
LogWriter::Log(log_what what, const log_message& data)
{
bigtime_t now = ::system_time();
@@ -155,7 +156,7 @@
}
// Enable or disable a particular log_what code's output
-void
+void
LogWriter::SetEnabled(log_what what, bool enable)
{
if (enable) mFilters.erase(what);
@@ -163,7 +164,7 @@
}
// enabling everything means just clearing out the filter set
-void
+void
LogWriter::EnableAllMessages()
{
mFilters.clear();
@@ -171,7 +172,7 @@
// disabling everything is more tedious -- we have to add them all to the
// filter set, one by one
-void
+void
LogWriter::DisableAllMessages()
{
// mFilters.insert(LOG_QUIT); // don't
disable our quit messages
@@ -222,7 +223,7 @@
// Writer thread's message handling function -- this is where messages are
actuall
// formatted and written to the log file
-void
+void
LogWriter::HandleMessage(log_what what, const log_message& msg)
{
char buf[256]; // scratch buffer for building logged output
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LogWriter.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -92,7 +93,7 @@
LoggingConsumer::LoggingConsumer(
const entry_ref& logFile,
BMediaAddOn* pAddOn)
-
+
: BMediaNode("LoggingConsumer"),
BBufferConsumer(B_MEDIA_UNKNOWN_TYPE),
BControllable(),
@@ -135,19 +136,19 @@
// Log message filtering control
//
-void
+void
LoggingConsumer::SetEnabled(log_what what, bool enable)
{
mLogger->SetEnabled(what, enable);
}
-void
+void
LoggingConsumer::EnableAllMessages()
{
mLogger->EnableAllMessages();
}
-void
+void
LoggingConsumer::DisableAllMessages()
{
mLogger->DisableAllMessages();
@@ -170,7 +171,7 @@
return NULL;
}
-void
+void
LoggingConsumer::SetRunMode(run_mode mode)
{
// !!! Need to handle offline mode etc. properly!
@@ -181,7 +182,7 @@
BMediaEventLooper::SetRunMode(mode);
}
-void
+void
LoggingConsumer::Preroll()
{
log_message logMsg;
@@ -191,7 +192,7 @@
BMediaEventLooper::Preroll();
}
-void
+void
LoggingConsumer::SetTimeSource(BTimeSource* time_source)
{
log_message logMsg;
@@ -201,7 +202,7 @@
BMediaNode::SetTimeSource(time_source);
}
-status_t
+status_t
LoggingConsumer::RequestCompleted(const media_request_info &info)
{
log_message logMsg;
@@ -211,7 +212,7 @@
return BMediaNode::RequestCompleted(info);
}
-// e.moon [11jun99; testing add-on]
+// e.moon [11jun99; testing add-on]
status_t
LoggingConsumer::DeleteHook(BMediaNode* pNode) {
PRINT(("LoggingConsumer::DeleteHook(%p)\n", pNode));
@@ -225,7 +226,7 @@
// BControllable methods
//
-status_t
+status_t
LoggingConsumer::GetParameterValue(int32 id, bigtime_t* last_change, void*
value, size_t* ioSize)
{
log_message logMsg;
@@ -266,7 +267,7 @@
return B_OK;
}
-void
+void
LoggingConsumer::SetParameterValue(int32 id, bigtime_t performance_time, const
void* value, size_t size)
{
log_message logMsg;
@@ -298,7 +299,7 @@
// BBufferConsumer methods
//
-status_t
+status_t
LoggingConsumer::HandleMessage(int32 message, const void *data, size_t size)
{
log_message logMsg;
@@ -315,7 +316,7 @@
// all of these next methods are pure virtual in BBufferConsumer
-status_t
+status_t
LoggingConsumer::AcceptFormat(const media_destination& dest, media_format*
format)
{
char formatStr[256];
@@ -334,14 +335,14 @@
return B_OK;
}
-status_t
+status_t
LoggingConsumer::GetNextInput(int32* cookie, media_input* out_input)
{
// we have a single hardcoded input that can accept any kind of media
data
if (0 == *cookie)
{
mInput.format.type = B_MEDIA_UNKNOWN_TYPE; //
accept any format
-
+
*out_input = mInput;
*cookie = 1;
return B_OK;
@@ -349,14 +350,14 @@
else return B_BAD_INDEX;
}
-void
+void
LoggingConsumer::DisposeInputCookie(int32 /*cookie*/ )
{
// we don't use any kind of state or extra storage for iterating over
our
// inputs, so we don't have to do any special disposal of input cookies.
}
-void
+void
LoggingConsumer::BufferReceived(BBuffer* buffer)
{
bigtime_t bufferStart = buffer->Header()->start_time;
@@ -393,7 +394,7 @@
}
}
-void
+void
LoggingConsumer::ProducerDataStatus(const media_destination& for_whom, int32
status, bigtime_t at_performance_time)
{
log_message logMsg;
@@ -409,7 +410,7 @@
}
}
-status_t
+status_t
LoggingConsumer::GetLatencyFor(const media_destination& for_whom, bigtime_t*
out_latency, media_node_id* out_timesource)
{
// make sure this is one of my valid inputs
@@ -422,7 +423,7 @@
return B_OK;
}
-status_t
+status_t
LoggingConsumer::Connected(
const media_source& producer,
const media_destination& where,
@@ -454,7 +455,7 @@
return B_OK;
}
-void
+void
LoggingConsumer::Disconnected(
const media_source& producer,
const media_destination& where)
@@ -467,7 +468,7 @@
memset(&mInput, 0, sizeof(mInput));
}
-status_t
+status_t
LoggingConsumer::FormatChanged(
const media_source& producer,
const media_destination& consumer,
@@ -481,7 +482,7 @@
return B_OK;
}
-status_t
+status_t
LoggingConsumer::SeekTagRequested(
const media_destination& destination,
bigtime_t in_target_time,
@@ -501,7 +502,7 @@
// BMediaEventLooper virtual methods
//
-void
+void
LoggingConsumer::NodeRegistered()
{
log_message logMsg;
@@ -523,7 +524,7 @@
strcpy(mInput.name, "Logged input");
}
-void
+void
LoggingConsumer::Start(bigtime_t performance_time)
{
PRINT(("LoggingConsumer::Start(%Ld): now %Ld\n", performance_time,
TimeSource()->Now()));
@@ -535,7 +536,7 @@
BMediaEventLooper::Start(performance_time);
}
-void
+void
LoggingConsumer::Stop(bigtime_t performance_time, bool immediate)
{
log_message logMsg;
@@ -545,7 +546,7 @@
BMediaEventLooper::Stop(performance_time, immediate);
}
-void
+void
LoggingConsumer::Seek(bigtime_t media_time, bigtime_t performance_time)
{
log_message logMsg;
@@ -555,7 +556,7 @@
BMediaEventLooper::Seek(media_time, performance_time);
}
-void
+void
LoggingConsumer::TimeWarp(bigtime_t at_real_time, bigtime_t
to_performance_time)
{
log_message logMsg;
@@ -565,7 +566,7 @@
BMediaEventLooper::TimeWarp(at_real_time, to_performance_time);
}
-void
+void
LoggingConsumer::HandleEvent(const media_timed_event *event, bigtime_t /*
lateness */, bool /* realTimeEvent */)
{
log_message logMsg;
@@ -628,12 +629,12 @@
break;
// !!! change to B_PARAMETER as soon as it's available
-
+
// +++++ e.moon [16jun99]
// !!! this can't be right: the parameter value is accessed by the
pointer
// originally passed to SetParameterValue(). there's no guarantee
that
// value's still valid, is there?
-
+
case BTimedEventQueue::B_USER_EVENT:
{
size_t dataSize = size_t(event->data);
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -138,7 +139,7 @@
/* the format; you should not ask him about it in here. */
status_t FormatChanged(
const media_source& producer,
- const media_destination& consumer,
+ const media_destination& consumer,
int32 change_tag,
const media_format& format);
@@ -149,7 +150,7 @@
status_t SeekTagRequested(
const media_destination& destination,
bigtime_t in_target_time,
- uint32 in_flags,
+ uint32 in_flags,
media_seek_tag* out_seek_tag,
bigtime_t* out_tagged_time,
uint32* out_flags);
@@ -181,7 +182,7 @@
bigtime_t mLastLatencyChange; // when did we last
change our latency?
bigtime_t mLastSpinChange; // when
did we last change our CPU usage?
bigtime_t mLastPrioChange; // when
did we last change thread priority?
-
+
// host addon
// [11jun99] e.moon
BMediaAddOn* m_pAddOn;
Modified:
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -57,7 +58,7 @@
}
LoggingConsumerAddOn::LoggingConsumerAddOn(image_id image) :
BMediaAddOn(image) {}
-
+
// -------------------------------------------------------- //
// BMediaAddOn impl
// -------------------------------------------------------- //
@@ -66,7 +67,7 @@
const char** out_failure_text) {
return B_OK;
}
-
+
int32 LoggingConsumerAddOn::CountFlavors() {
return 1;
}
@@ -76,7 +77,7 @@
const flavor_info** out_info) {
if(n)
return B_ERROR;
-
+
flavor_info* pInfo = new flavor_info;
pInfo->internal_id = n;
pInfo->name = "LoggingConsumer";
@@ -87,7 +88,7 @@
pInfo->kinds = B_BUFFER_CONSUMER | B_CONTROLLABLE;
pInfo->flavor_flags = 0;
pInfo->possible_count = 0;
-
+
pInfo->in_format_count = 1;
media_format* pFormat = new media_format;
pFormat->type = B_MEDIA_UNKNOWN_TYPE;
@@ -95,8 +96,8 @@
pInfo->out_format_count = 0;
pInfo->out_formats = 0;
-
-
+
+
*out_info = pInfo;
return B_OK;
}
@@ -109,7 +110,7 @@
// initialize log file
entry_ref ref;
get_ref_for_path(g_pLogPath, &ref);
- LoggingConsumer* pNode = new LoggingConsumer(ref, this);
+ LoggingConsumer* pNode = new LoggingConsumer(ref, this);
// trim down the log's verbosity a touch
pNode->SetEnabled(LOG_HANDLE_EVENT, false);
@@ -120,7 +121,7 @@
status_t LoggingConsumerAddOn::GetConfigurationFor(
BMediaNode* your_node,
BMessage* into_message) {
-
+
// no config yet
return B_OK;
}
Modified:
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerAddOn.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -46,11 +47,11 @@
class LoggingConsumerAddOn :
public BMediaAddOn {
typedef BMediaAddOn _inherited;
-
+
public: // ctor/dtor
virtual ~LoggingConsumerAddOn();
explicit LoggingConsumerAddOn(image_id image);
-
+
public: // BMediaAddOn impl
virtual status_t InitCheck(
const char** out_failure_text);
Modified:
haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/LoggingConsumerApp.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -32,7 +33,7 @@
// LoggingConsumerApp.cpp
//
// HISTORY
-// eamoon@xxxxxxxxxxxxx 11june99
+// eamoon@xxxxxxxxxxxxx 11june99
// [origin: Be Developer Newsletter III.18: 5may99]
#include "NodeHarnessApp.h"
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -39,7 +40,7 @@
{
}
-void
+void
NodeHarnessApp::ReadyToRun()
{
BWindow* win = new NodeHarnessWin(BRect(100, 200, 210, 330),
"NodeLogger");
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessApp.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -98,14 +99,14 @@
}
}
-void
+void
NodeHarnessWin::Quit()
{
be_app->PostMessage(B_QUIT_REQUESTED);
BWindow::Quit();
}
-void
+void
NodeHarnessWin::MessageReceived(BMessage *msg)
{
status_t err;
@@ -199,7 +200,7 @@
bigtime_t latency;
r->GetLatencyFor(mConnection.producer, &latency);
printf("Setting producer run mode latency to %Ld\n",
latency);
- r->SetProducerRunModeDelay(mConnection.producer,
latency + 6000);
+ r->SetProducerRunModeDelay(mConnection.producer,
latency + 6000);
// preroll first, to be a good citizen
r->PrerollNode(mConnection.consumer);
@@ -239,7 +240,7 @@
}
// Private routines
-void
+void
NodeHarnessWin::StopNodes()
{
mStartButton->SetEnabled(true);
Modified: haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/LoggingConsumer/NodeHarnessWin.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1991-1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
Modified: haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -29,13 +30,6 @@
*/
-/*
- NodeHarnessApp.cpp
-
- Copyright 1999, Be Incorporated. All Rights Reserved.
- This file may be used under the terms of the Be Sample Code License.
-*/
-
#include "NodeHarnessApp.h"
#include "NodeHarnessWin.h"
@@ -44,7 +38,7 @@
{
}
-void
+void
NodeHarnessApp::ReadyToRun()
{
BWindow* win = new NodeHarnessWin(BRect(100, 200, 210, 330),
"ToneProducer");
Modified: haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessApp.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -29,13 +30,6 @@
*/
-/*
- NodeHarnessApp.h
-
- Copyright 1999, Be Incorporated. All Rights Reserved.
- This file may be used under the terms of the Be Sample Code License.
-*/
-
#ifndef NodeHarnessApp_H
#define NodeHarnessApp_H 1
Modified: haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -29,13 +30,6 @@
*/
-/*
- NodeHarnessWin.cpp
-
- Copyright 1999, Be Incorporated. All Rights Reserved.
- This file may be used under the terms of the Be Sample Code License.
-*/
-
#include "NodeHarnessWin.h"
#include "ToneProducer.h"
#include <app/Application.h>
@@ -83,7 +77,7 @@
mStopButton = new BButton(r, "Stop", "Stop", new BMessage(BUTTON_STOP));
mStopButton->SetEnabled(false);
AddChild(mStopButton);
-
+
// e.moon 2jun99: create the node
BMediaRoster* roster = BMediaRoster::Roster();
mToneNode = new ToneProducer();
@@ -120,14 +114,14 @@
}
}
-void
+void
NodeHarnessWin::Quit()
{
be_app->PostMessage(B_QUIT_REQUESTED);
BWindow::Quit();
}
-void
+void
NodeHarnessWin::MessageReceived(BMessage *msg)
{
status_t err;
@@ -176,7 +170,7 @@
// got the endpoints; now we connect it!
media_format format;
- format.type = B_MEDIA_RAW_AUDIO;
+ format.type = B_MEDIA_RAW_AUDIO;
format.u.raw_audio = media_raw_audio_format::wildcard;
err = r->Connect(soundOutput.source,
mixerInput.destination, &format, &soundOutput, &mixerInput);
ErrorCheck(err, "unable to connect nodes");
@@ -228,7 +222,7 @@
}
// Private routines
-void
+void
NodeHarnessWin::StopNodes()
{
mStartButton->SetEnabled(true);
Modified: haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.h
===================================================================
--- haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.h
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/ToneProducer/NodeHarnessWin.h
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -29,13 +30,6 @@
*/
-/*
- NodeHarnessWin.h
-
- Copyright 1999, Be Incorporated. All Rights Reserved.
- This file may be used under the terms of the Be Sample Code License.
-*/
-
#ifndef NodeHarnessWin_H
#define NodeHarnessWin_H 1
Modified: haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducer.cpp
===================================================================
--- haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducer.cpp
2011-08-14 17:45:05 UTC (rev 42634)
+++ haiku/trunk/src/apps/cortex/addons/ToneProducer/ToneProducer.cpp
2011-08-14 18:05:48 UTC (rev 42635)
@@ -1,4 +1,5 @@
/*
+ * Copyright 1999, Be Incorporated.
* Copyright (c) 1999-2000, Eric Moon.
* All rights reserved.
*
@@ -32,9 +33,6 @@
/*
ToneProducer.cpp
- Copyright 1999, Be Incorporated. All Rights Reserved.
- This file may be used under the terms of the Be Sample Code License.
-
NOTE: to compile this code under Genki beta releases, do a search-
and-replace to change "B_PARAMETER" to "B_USER_EVENT+1"
*/
@@ -150,7 +148,7 @@
//#pragma mark -
// BControllable methods
-status_t
+status_t
ToneProducer::GetParameterValue(int32 id, bigtime_t* last_change, void* value,
size_t* ioSize)
{
FPRINTF(stderr, "ToneProducer::GetParameterValue\n");
@@ -191,7 +189,7 @@
return B_OK;
}
-void
+void
ToneProducer::SetParameterValue(int32 id, bigtime_t performance_time, const
void* value, size_t size)
{
switch (id)
@@ -224,14 +222,14 @@
if(pMessenger && pMessenger->IsValid()) {
PRINT(("\tgot valid control panel\n"));
}
-
+
return err;
}
//#pragma mark -
// BBufferProducer methods
-status_t
+status_t
ToneProducer::FormatSuggestionRequested(media_type type, int32 /*quality*/,
media_format* format)
{
// FormatSuggestionRequested() is not necessarily part of the format
negotiation
@@ -256,7 +254,7 @@
else return B_OK;
}
-status_t
+status_t
ToneProducer::FormatProposal(const media_source& output, media_format* format)
{
// FormatProposal() is the first stage in the BMediaRoster::Connect()
process. We hand
@@ -272,7 +270,7 @@
// we only support floating-point raw audio, so we always return that,
but we
// supply an error code depending on whether we found the proposal
acceptable.
-
+
media_type requestedType = format->type;
*format = mPreferredFormat;
if ((requestedType != B_MEDIA_UNKNOWN_TYPE) && (requestedType !=
B_MEDIA_RAW_AUDIO))
@@ -283,7 +281,7 @@
else return B_OK; // raw audio or wildcard type, either
is okay by us
}
-status_t
+status_t
ToneProducer::FormatChangeRequested(const media_source& source, const
media_destination& destination, media_format* io_format, int32* _deprecated_)
{
FPRINTF(stderr, "ToneProducer::FormatChangeRequested\n");
@@ -292,7 +290,7 @@
return B_ERROR;
}
-status_t
+status_t
ToneProducer::GetNextOutput(int32* cookie, media_output* out_output)
{
FPRINTF(stderr, "ToneProducer::GetNextOutput\n");
@@ -309,7 +307,7 @@
else return B_BAD_INDEX;
}
-status_t
+status_t
ToneProducer::DisposeOutputCookie(int32 cookie)
{
FPRINTF(stderr, "ToneProducer::DisposeOutputCookie\n");
@@ -318,7 +316,7 @@
return B_OK;
}
-status_t
+status_t
ToneProducer::SetBufferGroup(const media_source& for_source, BBufferGroup*
newGroup)
{
FPRINTF(stderr, "ToneProducer::SetBufferGroup\n");
@@ -353,7 +351,7 @@
return B_OK;
}
-status_t
+status_t
ToneProducer::GetLatency(bigtime_t* out_latency)
{
FPRINTF(stderr, "ToneProducer::GetLatency\n");
@@ -363,7 +361,7 @@
return B_OK;
}
-status_t
+status_t
ToneProducer::PrepareToConnect(const media_source& what, const
media_destination& where, media_format* format, media_source* out_source, char*
out_name)
{
// PrepareToConnect() is the second stage of format negotiations that
happens
@@ -396,8 +394,8 @@
format->u.raw_audio.channel_count = 2;
return B_MEDIA_BAD_FORMAT;
}
-
+
// !!! validate all other fields except for buffer_size here, because
the consumer might have
// supplied different values from AcceptFormat()?
@@ -429,13 +427,13 @@
{
FPRINTF(stderr, "\tconsumer suggested buffer_size %lu\n",
format->u.raw_audio.buffer_size);
}
-
+
// Now reserve the connection, and return information about it
mOutput.destination = where;
mOutput.format = *format;
*out_source = mOutput.source;
strncpy(out_name, mOutput.name, B_MEDIA_NAME_LENGTH);
-
+
char formatStr[256];
string_for_format(*format, formatStr, 255);
FPRINTF(stderr, "\treturning format: %s\n", formatStr);
@@ -443,7 +441,7 @@
return B_OK;
}
-void
+void
ToneProducer::Connect(status_t error, const media_source& source, const
media_destination& destination, const media_format& format, char* io_name)
{
FPRINTF(stderr, "ToneProducer::Connect\n");
@@ -470,7 +468,7 @@
// FPRINTF(stderr, "\tcorrupted format; falling back to last
suggested format\n");
// format = mOutput.format;
// }
-//
+//
// Okay, the connection has been confirmed. Record the destination and
format
// that we agreed on, and report our connection name again.
@@ -505,7 +503,7 @@
// reset our buffer duration, etc. to avoid later calculations
// +++++ e.moon 11jun99: crashes w/ divide-by-zero when connecting to
LoggingConsumer
ASSERT(mOutput.format.u.raw_audio.frame_rate);
-
+
bigtime_t duration = bigtime_t(1000000) * samplesPerBuffer /
bigtime_t(mOutput.format.u.raw_audio.frame_rate);
SetBufferDuration(duration);
@@ -516,7 +514,7 @@
if (!mBufferGroup) AllocateBuffers();
}
-void
+void
ToneProducer::Disconnect(const media_source& what, const media_destination&
where)
{
FPRINTF(stderr, "ToneProducer::Disconnect\n");
@@ -536,7 +534,7 @@
}
}
-void
+void
ToneProducer::LateNoticeReceived(const media_source& what, bigtime_t how_much,
bigtime_t performance_time)
{
FPRINTF(stderr, "ToneProducer::LateNoticeReceived\n");
@@ -577,7 +575,7 @@
}
}
-void
+void
ToneProducer::EnableOutput(const media_source& what, bool enabled, int32*
_deprecated_)
{
FPRINTF(stderr, "ToneProducer::EnableOutput\n");
@@ -592,7 +590,7 @@
}
}
-status_t
+status_t
ToneProducer::SetPlayRate(int32 numer, int32 denom)
{
FPRINTF(stderr, "ToneProducer::SetPlayRate\n");
@@ -602,7 +600,7 @@
return B_ERROR;
}
-status_t
+status_t
ToneProducer::HandleMessage(int32 message, const void* data, size_t size)
{
FPRINTF(stderr, "ToneProducer::HandleMessage(%ld = 0x%lx)\n", message,
message);
@@ -615,7 +613,7 @@
return B_ERROR;
}
-void
+void
ToneProducer::AdditionalBufferRequested(const media_source& source,
media_buffer_id prev_buffer, bigtime_t prev_time, const media_seek_tag*
prev_tag)
{
FPRINTF(stderr, "ToneProducer::AdditionalBufferRequested\n");
@@ -624,7 +622,7 @@
return;
}
-void
+void
ToneProducer::LatencyChanged(
const media_source& source,
const media_destination& destination,
@@ -645,7 +643,7 @@
}
/*
// Workaround for a Metrowerks PPC compiler bug
-status_t
+status_t
ToneProducer::DeleteHook(BMediaNode* node)
{
return BMediaEventLooper::DeleteHook(node);
[... truncated: 580 lines follow ...]
Other related posts:
- » [haiku-commits] r42635 - in haiku/trunk/src/apps/cortex: addons/LoggingConsumer addons/ToneProducer addons/common support - mattmadia
