hrev49479 adds 2 changesets to branch 'master'
old head: 5f01992f3a0e84d24c1a0f5d1dd81bd5b7b2c8d5
new head: 922d2034b2a2818465589969b7d682661553a9fd
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=922d2034b2a2+%5E5f01992f3a0e
----------------------------------------------------------------------------
1ce097dbb057: BMediaRoster: Wait with more calm for services to be up.
* Needed to avoid the app restarting things too fast. This
is a problem that should be solved, added a TODO.
922d2034b2a2: Media: Reinit media also when the restart thread finish
[ Dario Casalinuovo <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 6 insertions(+)
src/kits/media/MediaRoster.cpp | 5 +++++
src/preferences/media/MediaWindow.cpp | 1 +
############################################################################
Commit: 1ce097dbb0577074ada08fefb78df51a76c2ab08
URL: http://cgit.haiku-os.org/haiku/commit/?id=1ce097dbb057
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Thu Jul 30 11:15:05 2015 UTC
BMediaRoster: Wait with more calm for services to be up.
* Needed to avoid the app restarting things too fast. This
is a problem that should be solved, added a TODO.
----------------------------------------------------------------------------
diff --git a/src/kits/media/MediaRoster.cpp b/src/kits/media/MediaRoster.cpp
index 22de1ac..e386c2d 100644
--- a/src/kits/media/MediaRoster.cpp
+++ b/src/kits/media/MediaRoster.cpp
@@ -3377,6 +3377,11 @@ BMediaRoster::MessageReceived(BMessage* message)
// Send the notification to our subscribers
if (BMediaRoster::IsRunning()) {
sServerIsUp = true;
+ // Wait for media services to wake up
+ // TODO: This should be solved so that the
server
+ // have a way to notify us when the system is
really
+ // ready to run and we avoid sleeping.
+ snooze(2000000);
// Restore our friendship with the media servers
if (MediaRosterEx(this)->BuildConnections() !=
B_OK) {
TRACE("BMediaRoster::MessageReceived
can't reconnect"
############################################################################
Revision: hrev49479
Commit: 922d2034b2a2818465589969b7d682661553a9fd
URL: http://cgit.haiku-os.org/haiku/commit/?id=922d2034b2a2
Author: Dario Casalinuovo <b.vitruvio@xxxxxxxxx>
Date: Thu Jul 30 11:18:24 2015 UTC
Media: Reinit media also when the restart thread finish
----------------------------------------------------------------------------
diff --git a/src/preferences/media/MediaWindow.cpp
b/src/preferences/media/MediaWindow.cpp
index 73006eb..05a951b 100644
--- a/src/preferences/media/MediaWindow.cpp
+++ b/src/preferences/media/MediaWindow.cpp
@@ -324,6 +324,7 @@ MediaWindow::MessageReceived(BMessage* message)
switch (message->what) {
case ML_RESTART_THREAD_FINISHED:
fRestartThread = -1;
+ _InitMedia(false);
break;
case ML_RESTART_MEDIA_SERVER:
