From 61dec6a5c7d0ec3b948ad087dacb23abeafae947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 23 Jan 2004 07:34:25 +0000 Subject: [PATCH] Removed now unused GET_FORMAT_FOR_DESCRIPTION and GET_DESCRIPTION_FOR_FORMAT stuff. Simplified ServerApp::MessageReceived() and added MEDIA_SERVER_GET_FORMATS to it. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6244 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/media/media_server.cpp | 44 +++++++++++++----------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/src/servers/media/media_server.cpp b/src/servers/media/media_server.cpp index 42c611b88c..620390bc7b 100644 --- a/src/servers/media/media_server.cpp +++ b/src/servers/media/media_server.cpp @@ -119,7 +119,6 @@ ServerApp::ServerApp() : BApplication(NEW_MEDIA_SERVER_SIGNATURE), fLocker(new BLocker("media server locker")) { - gNotificationManager = new NotificationManager; gBufferManager = new BufferManager; gAppManager = new AppManager; @@ -682,24 +681,6 @@ ServerApp::HandleMessage(int32 code, void *data, size_t size) request->SendReply(rv, &reply, sizeof(reply)); break; } - - case SERVER_GET_FORMAT_FOR_DESCRIPTION: - { - const server_get_format_for_description_request *request = reinterpret_cast(data); - server_get_format_for_description_reply reply; - rv = gFormatManager->GetFormatForDescription(&reply.format, request->description); - request->SendReply(rv, &reply, sizeof(reply)); - break; - } - - case SERVER_GET_DESCRIPTION_FOR_FORMAT: - { - const server_get_description_for_format_request *request = reinterpret_cast(data); - server_get_description_for_format_reply reply; - rv = gFormatManager->GetDescriptionForFormat(&reply.description, request->format, request->family); - request->SendReply(rv, &reply, sizeof(reply)); - break; - } case SERVER_GET_READERS: { @@ -745,18 +726,31 @@ ServerApp::MessageReceived(BMessage *msg) { TRACE("ServerApp::MessageReceived %lx enter\n", msg->what); switch (msg->what) { - case MEDIA_SERVER_REQUEST_NOTIFICATIONS: gNotificationManager->EnqueueMessage(msg); break; - case MEDIA_SERVER_CANCEL_NOTIFICATIONS: gNotificationManager->EnqueueMessage(msg); break; - case MEDIA_SERVER_SEND_NOTIFICATIONS: gNotificationManager->EnqueueMessage(msg); break; - case MMEDIAFILESMANAGER_SAVE_TIMER: gMMediaFilesManager->TimerMessage(); break; - default: inherited::MessageReceived(msg); break; + case MEDIA_SERVER_REQUEST_NOTIFICATIONS: + case MEDIA_SERVER_CANCEL_NOTIFICATIONS: + case MEDIA_SERVER_SEND_NOTIFICATIONS: + gNotificationManager->EnqueueMessage(msg); + break; + + case MMEDIAFILESMANAGER_SAVE_TIMER: + gMMediaFilesManager->TimerMessage(); + break; + + case MEDIA_SERVER_GET_FORMATS: + gFormatManager->GetFormats(*msg); + break; + + default: + inherited::MessageReceived(msg); //printf("\nnew media server: unknown message received\n"); //msg->PrintToStream(); + break; } TRACE("ServerApp::MessageReceived %lx leave\n", msg->what); } -int main() +int +main() { new ServerApp; be_app->Run();