hrev49448 adds 3 changesets to branch 'master'
old head: 3108062744a963f6a87f9b7c94dc28ae9a53fc79
new head: 2303600a81b4bccf048a73954a4c8380c55830fd
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=2303600a81b4+%5E3108062744a9
----------------------------------------------------------------------------
d009f2861397: media_kit: Fix style as suggested in ml
6d2f2ec177bf: Rework nodes to call Run() only after registration
* While it should not be a big problem the
bebook specify to do it after custom operations,
most nodes also follow this way, this commit restore
consistency.
2303600a81b4: TimedEventQueuePrivate: Remove debugger call
[ Dario Casalinuovo <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
16 files changed, 61 insertions(+), 61 deletions(-)
src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp | 5 ++---
.../media/media-add-ons/equalizer/EqualizerNode.cpp | 6 +++---
.../media/media-add-ons/esound_sink/ESDSinkNode.cpp | 7 +++----
.../media/media-add-ons/firewire_dv/FireWireDVNode.cpp | 6 +++---
src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp | 5 +++--
.../media/media-add-ons/multi_audio/MultiAudioNode.cpp | 11 +++++++----
.../media/media-add-ons/opensound/OpenSoundNode.cpp | 7 +++----
.../media-add-ons/tone_producer_demo/ToneProducer.cpp | 8 ++++----
src/add-ons/media/media-add-ons/vst_host/VSTNode.cpp | 6 +++---
src/apps/cortex/addons/Flanger/FlangerNode.cpp | 8 ++++----
src/apps/cortex/addons/common/AudioFilterNode.cpp | 8 ++++----
.../media_node_framework/audio/AudioProducer.cpp | 8 ++++----
src/kits/game/GameProducer.cpp | 8 ++++----
src/kits/media/MediaRoster.cpp | 12 +++++-------
src/kits/media/TimedEventQueuePrivate.cpp | 9 +++++----
src/servers/media/media_server.cpp | 8 ++++----
############################################################################
Commit: d009f2861397a85c95776afb615ff2c6f50723f8
URL: http://cgit.haiku-os.org/haiku/commit/?id=d009f2861397
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Fri Jul 24 17:29:26 2015 UTC
media_kit: Fix style as suggested in ml
----------------------------------------------------------------------------
diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp
index 42c3a32..012a218 100644
--- a/src/kits/media/MediaRoster.cpp
+++ b/src/kits/media/MediaRoster.cpp
@@ -118,9 +118,9 @@ BMediaRosterEx::BMediaRosterEx(status_t* _error)
InitRosterDataExchange(BMessenger(this, this));
if (be_roster->StartWatching(BMessenger(this, this),
- B_REQUEST_LAUNCHED | B_REQUEST_QUIT) != B_OK)
- *_error = B_ERROR;
-
+ B_REQUEST_LAUNCHED | B_REQUEST_QUIT) != B_OK) {
+ *_error = B_ERROR;
+ }
sServerIsUp = BMediaRoster::IsRunning();
}
@@ -3262,10 +3262,8 @@ BMediaRoster::GetInstancesFor(media_addon_id addon,
int32 flavor,
bool
BMediaRoster::IsRunning()
{
- if (be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)
- && be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE))
- return true;
- return false;
+ return be_roster->IsRunning(B_MEDIA_SERVER_SIGNATURE)
+ && be_roster->IsRunning(B_MEDIA_ADDON_SERVER_SIGNATURE);
}
diff --git a/src/servers/media/media_server.cpp
b/src/servers/media/media_server.cpp
index c023bfc..241c114 100644
--- a/src/servers/media/media_server.cpp
+++ b/src/servers/media/media_server.cpp
@@ -116,8 +116,8 @@ ServerApp::ServerApp()
BMediaRoster* roster = BMediaRoster::Roster();
if (roster->StartWatching(BMessenger(this, this),
- B_MEDIA_SERVER_QUIT) != B_OK) {
- TRACE("ServerApp: can't watch for B_MEDIA_SERVER_QUIT");
+ B_MEDIA_SERVER_QUIT) != B_OK) {
+ TRACE("ServerApp: can't watch for B_MEDIA_SERVER_QUIT");
}
}
@@ -138,8 +138,8 @@ ServerApp::~ServerApp()
BMediaRoster* roster = BMediaRoster::CurrentRoster();
if (roster->StopWatching(BMessenger(this, this),
- B_MEDIA_SERVER_QUIT) != B_OK) {
- TRACE("ServerApp: can't unwatch for
B_MEDIA_SERVER_QUIT");
+ B_MEDIA_SERVER_QUIT) != B_OK) {
+ TRACE("ServerApp: can't unwatch for B_MEDIA_SERVER_QUIT");
}
}
############################################################################
Commit: 6d2f2ec177bf615a117a7428d71be4330545b320
URL: http://cgit.haiku-os.org/haiku/commit/?id=6d2f2ec177bf
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Fri Jul 24 17:50:08 2015 UTC
Rework nodes to call Run() only after registration
* While it should not be a big problem the
bebook specify to do it after custom operations,
most nodes also follow this way, this commit restore
consistency.
----------------------------------------------------------------------------
diff --git a/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
b/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
index 7cac93c..1da2a4c 100644
--- a/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
+++ b/src/add-ons/media/media-add-ons/dvb/DVBMediaNode.cpp
@@ -181,9 +181,6 @@ DVBMediaNode::DVBMediaNode(
fRequiredFormatEncAudio = fDefaultFormatEncAudio;
fRequiredFormatTS = fDefaultFormatTS;
- // start the BMediaEventLooper control loop running
- Run();
-
TRACE("current RunMode = %d\n", RunMode());
#ifdef DUMP_VIDEO
@@ -350,6 +347,8 @@ DVBMediaNode::NodeRegistered()
//printf("RunMode = %d\n", RunMode());
//printf("_m_recordDelay = %Ld\n", _m_recordDelay);
+
+ Run();
}
diff --git a/src/add-ons/media/media-add-ons/equalizer/EqualizerNode.cpp
b/src/add-ons/media/media-add-ons/equalizer/EqualizerNode.cpp
index 271b026..a955c6d 100644
--- a/src/add-ons/media/media-add-ons/equalizer/EqualizerNode.cpp
+++ b/src/add-ons/media/media-add-ons/equalizer/EqualizerNode.cpp
@@ -66,9 +66,6 @@ EqualizerNode::HandleMessage(int32 message, const void *data,
size_t size)
void
EqualizerNode::NodeRegistered()
{
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
fPreferredFormat.type = B_MEDIA_RAW_AUDIO;
fPreferredFormat.u.raw_audio.buffer_size = BUFF_SIZE;
fPreferredFormat.u.raw_audio = media_raw_audio_format::wildcard;
@@ -95,6 +92,9 @@ EqualizerNode::NodeRegistered()
InitParameterValues();
InitParameterWeb();
+
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
diff --git a/src/add-ons/media/media-add-ons/esound_sink/ESDSinkNode.cpp
b/src/add-ons/media/media-add-ons/esound_sink/ESDSinkNode.cpp
index 6e4fd3f..9cef0a5 100644
--- a/src/add-ons/media/media-add-ons/esound_sink/ESDSinkNode.cpp
+++ b/src/add-ons/media/media-add-ons/esound_sink/ESDSinkNode.cpp
@@ -195,10 +195,6 @@ void ESDSinkNode::NodeRegistered(void)
return;
}
- SetPriority(B_REAL_TIME_PRIORITY);
-
- Run();
-
// media_input *input = new media_input;
fInput.format = fPreferredFormat;
@@ -236,6 +232,9 @@ void ESDSinkNode::NodeRegistered(void)
#ifdef PRINTING
PRINT(("apply configuration in : %lld\n", system_time() - start));
#endif
+
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
status_t ESDSinkNode::RequestCompleted(const media_request_info &info)
diff --git a/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVNode.cpp
b/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVNode.cpp
index b2958f9..364ed13 100644
--- a/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVNode.cpp
+++ b/src/add-ons/media/media-add-ons/firewire_dv/FireWireDVNode.cpp
@@ -138,9 +138,6 @@ FireWireDVNode::NodeRegistered()
{
CALLED();
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
fOutputEncVideo.node = Node();
fOutputEncVideo.source.port = ControlPort();
fOutputEncVideo.source.id = 0;
@@ -149,6 +146,9 @@ FireWireDVNode::NodeRegistered()
strcpy(fOutputEncVideo.name, "encoded video");
RefreshParameterWeb();
+
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
diff --git a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
index ab5d5ce..f532179 100644
--- a/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
+++ b/src/add-ons/media/media-add-ons/mixer/AudioMixer.cpp
@@ -17,6 +17,7 @@
#include <Buffer.h>
#include <Catalog.h>
#include <FindDirectory.h>
+#include <MediaDefs.h>
#include <MediaRoster.h>
#include <ParameterWeb.h>
#include <Path.h>
@@ -1066,9 +1067,9 @@ AudioMixer::EnableOutput(const media_source& what, bool
enabled,
void
AudioMixer::NodeRegistered()
{
- Run();
- SetPriority(120);
UpdateParameterWeb();
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
diff --git a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
index 6b46426..69b6572 100644
--- a/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
+++ b/src/add-ons/media/media-add-ons/multi_audio/MultiAudioNode.cpp
@@ -168,8 +168,11 @@ node_output::~node_output()
MultiAudioNode::MultiAudioNode(BMediaAddOn* addon, const char* name,
MultiAudioDevice* device, int32 internalID, BMessage* config)
- : BMediaNode(name), BBufferConsumer(B_MEDIA_RAW_AUDIO),
+ :
+ BMediaNode(name),
+ BBufferConsumer(B_MEDIA_RAW_AUDIO),
BBufferProducer(B_MEDIA_RAW_AUDIO),
+ BMediaEventLooper(),
fBufferLock("multi audio buffers"),
fThread(-1),
fDevice(device),
@@ -335,9 +338,6 @@ MultiAudioNode::NodeRegistered()
return;
}
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
node_input *currentInput = NULL;
int32 currentId = 0;
@@ -461,6 +461,9 @@ MultiAudioNode::NodeRegistered()
PRINT(("apply configuration in : %" B_PRIdBIGTIME "\n",
system_time() - start));
+
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
diff --git a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
index 8658b8b..286eef3 100644
--- a/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
+++ b/src/add-ons/media/media-add-ons/opensound/OpenSoundNode.cpp
@@ -448,10 +448,6 @@ OpenSoundNode::NodeRegistered()
return;
}
- SetPriority(B_REAL_TIME_PRIORITY);
-
- Run();
-
TRACE("NodeRegistered: %d engines\n", fDevice->CountEngines());
for (int32 i = 0; i < fDevice->CountEngines(); i++) {
OpenSoundDeviceEngine* engine = fDevice->EngineAt(i);
@@ -576,6 +572,9 @@ OpenSoundNode::NodeRegistered()
}
TRACE("apply configuration in : %lldµs\n", system_time() - start);
+
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
diff --git
a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp
b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp
index 020b723..e4c8a0d 100644
--- a/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp
+++ b/src/add-ons/media/media-add-ons/tone_producer_demo/ToneProducer.cpp
@@ -629,16 +629,16 @@ ToneProducer::NodeRegistered()
{
FPRINTF(stderr, "ToneProducer::NodeRegistered\n");
- // Start the BMediaEventLooper thread
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
// output init moved to ctor
// e.moon [4jun99]
// Set up our parameter web
mWeb = make_parameter_web();
SetParameterWeb(mWeb);
+
+ // Start the BMediaEventLooper thread
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
void
diff --git a/src/add-ons/media/media-add-ons/vst_host/VSTNode.cpp
b/src/add-ons/media/media-add-ons/vst_host/VSTNode.cpp
index 99e704d..13ae66d 100644
--- a/src/add-ons/media/media-add-ons/vst_host/VSTNode.cpp
+++ b/src/add-ons/media/media-add-ons/vst_host/VSTNode.cpp
@@ -64,9 +64,6 @@ VSTNode::HandleMessage(int32 message, const void* data,
size_t size)
void
VSTNode::NodeRegistered()
{
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
fPreferredFormat.type = B_MEDIA_RAW_AUDIO;
fPreferredFormat.u.raw_audio.buffer_size = BUFF_SIZE;
fPreferredFormat.u.raw_audio = media_raw_audio_format::wildcard;
@@ -93,6 +90,9 @@ VSTNode::NodeRegistered()
InitParameterValues();
InitParameterWeb();
+
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
//BControllable
diff --git a/src/apps/cortex/addons/Flanger/FlangerNode.cpp
b/src/apps/cortex/addons/Flanger/FlangerNode.cpp
index d162d93..bb188a2 100644
--- a/src/apps/cortex/addons/Flanger/FlangerNode.cpp
+++ b/src/apps/cortex/addons/Flanger/FlangerNode.cpp
@@ -227,10 +227,6 @@ void FlangerNode::NodeRegistered() {
PRINT(("FlangerNode::NodeRegistered()\n"));
- // Start the BMediaEventLooper thread
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
// figure preferred ('template') format
m_preferredFormat.type = B_MEDIA_RAW_AUDIO;
getPreferredFormat(m_preferredFormat);
@@ -258,6 +254,10 @@ void FlangerNode::NodeRegistered() {
// init parameters
initParameterValues();
initParameterWeb();
+
+ // Start the BMediaEventLooper thread
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
// "Augment OfflineTime() to compute the node's current time; it's called
diff --git a/src/apps/cortex/addons/common/AudioFilterNode.cpp
b/src/apps/cortex/addons/common/AudioFilterNode.cpp
index a43901d..a78f526 100644
--- a/src/apps/cortex/addons/common/AudioFilterNode.cpp
+++ b/src/apps/cortex/addons/common/AudioFilterNode.cpp
@@ -383,10 +383,6 @@ void AudioFilterNode::NodeRegistered() {
PRINT(("AudioFilterNode::NodeRegistered()\n"));
status_t err;
-
- // Start the BMediaEventLooper thread
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
// init input
m_input.destination.port = ControlPort();
@@ -414,6 +410,10 @@ void AudioFilterNode::NodeRegistered() {
// init parameters
initParameterWeb();
+
+ // Start the BMediaEventLooper thread
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
// "Augment OfflineTime() to compute the node's current time; it's called
diff --git a/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
b/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
index d870dfe..036763a 100644
--- a/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
+++ b/src/apps/mediaplayer/media_node_framework/audio/AudioProducer.cpp
@@ -587,15 +587,15 @@ AudioProducer::NodeRegistered()
{
TRACE("%p->AudioProducer::NodeRegistered()\n", this);
- // Start the BMediaEventLooper thread
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
// set up as much information about our output as we can
fOutput.source.port = ControlPort();
fOutput.source.id = 0;
fOutput.node = Node();
::strcpy(fOutput.name, Name());
+
+ // Start the BMediaEventLooper thread
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
diff --git a/src/kits/game/GameProducer.cpp b/src/kits/game/GameProducer.cpp
index a03c468..c173058 100644
--- a/src/kits/game/GameProducer.cpp
+++ b/src/kits/game/GameProducer.cpp
@@ -422,15 +422,15 @@ GameProducer::AdditionalBufferRequested(const
media_source& source,
void
GameProducer::NodeRegistered()
{
- // Start the BMediaEventLooper thread
- SetPriority(B_REAL_TIME_PRIORITY);
- Run();
-
// set up as much information about our output as we can
fOutput.source.port = ControlPort();
fOutput.source.id = 0;
fOutput.node = Node();
strlcpy(fOutput.name, "GameProducer Output", B_MEDIA_NAME_LENGTH);
+
+ // Start the BMediaEventLooper thread
+ SetPriority(B_REAL_TIME_PRIORITY);
+ Run();
}
############################################################################
Revision: hrev49448
Commit: 2303600a81b4bccf048a73954a4c8380c55830fd
URL: http://cgit.haiku-os.org/haiku/commit/?id=2303600a81b4
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Fri Jul 24 18:44:24 2015 UTC
TimedEventQueuePrivate: Remove debugger call
----------------------------------------------------------------------------
diff --git a/src/kits/media/TimedEventQueuePrivate.cpp
b/src/kits/media/TimedEventQueuePrivate.cpp
index c5517c9..3cc337c 100644
--- a/src/kits/media/TimedEventQueuePrivate.cpp
+++ b/src/kits/media/TimedEventQueuePrivate.cpp
@@ -566,13 +566,14 @@ _event_queue_imp::CleanupEvent(media_timed_event *event)
if (event->cleanup == BTimedEventQueue::B_NO_CLEANUP) {
// do nothing
- } else if (event->type == BTimedEventQueue::B_HANDLE_BUFFER &&
event->cleanup == BTimedEventQueue::B_RECYCLE_BUFFER) {
+ } else if (event->type == BTimedEventQueue::B_HANDLE_BUFFER
+ && event->cleanup ==
BTimedEventQueue::B_RECYCLE_BUFFER) {
((BBuffer *)event->pointer)->Recycle();
DEBUG_ONLY(*const_cast<void **>(&event->pointer) = NULL);
} else if (event->cleanup == BTimedEventQueue::B_EXPIRE_TIMER) {
- // call TimerExpired() on the event->data
- debugger("BTimedEventQueue cleanup: calling TimerExpired()
should be implemented here\n");
- } else if (event->cleanup == B_DELETE || event->cleanup >=
BTimedEventQueue::B_USER_CLEANUP) {
+ // do nothing, called in BMediaEventLooper::DispatchEvent
+ } else if (event->cleanup == B_DELETE
+ || event->cleanup >= BTimedEventQueue::B_USER_CLEANUP) {
if (fCleanupHook)
(*fCleanupHook)(event,fCleanupHookContext);
} else {
