i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed now unused GET_FORMAT_FOR_DESCRIPTION and GET_DESCRIPTION_FOR_FORMAT

Browse Source 
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
This commit is contained in:
Axel Dörfler
2004-01-23 07:34:25 +00:00
parent a898baf0cc
commit 61dec6a5c7
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/media/media_server.cpp
+19 -25
View File
@@ -119,7 +119,6 @@ ServerApp::ServerApp()
: BApplication(NEW_MEDIA_SERVER_SIGNATURE), : BApplication(NEW_MEDIA_SERVER_SIGNATURE),
fLocker(new BLocker("media server locker")) fLocker(new BLocker("media server locker"))
{ {
gNotificationManager = new NotificationManager; gNotificationManager = new NotificationManager;
gBufferManager = new BufferManager; gBufferManager = new BufferManager;
gAppManager = new AppManager; gAppManager = new AppManager;
@@ -683,24 +682,6 @@ ServerApp::HandleMessage(int32 code, void *data, size_t size)
break; break;
} }
case SERVER_GET_FORMAT_FOR_DESCRIPTION:
{
const server_get_format_for_description_request *request = reinterpret_cast<const server_get_format_for_description_request *>(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<const server_get_description_for_format_request *>(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: case SERVER_GET_READERS:
{ {
const server_get_readers_request *request = reinterpret_cast<const server_get_readers_request *>(data); const server_get_readers_request *request = reinterpret_cast<const server_get_readers_request *>(data);
@@ -745,18 +726,31 @@ ServerApp::MessageReceived(BMessage *msg)
{ {
TRACE("ServerApp::MessageReceived %lx enter\n", msg->what); TRACE("ServerApp::MessageReceived %lx enter\n", msg->what);
switch (msg->what) { switch (msg->what) {
case MEDIA_SERVER_REQUEST_NOTIFICATIONS: gNotificationManager->EnqueueMessage(msg); break; case MEDIA_SERVER_REQUEST_NOTIFICATIONS:
case MEDIA_SERVER_CANCEL_NOTIFICATIONS: gNotificationManager->EnqueueMessage(msg); break; case MEDIA_SERVER_CANCEL_NOTIFICATIONS:
case MEDIA_SERVER_SEND_NOTIFICATIONS: gNotificationManager->EnqueueMessage(msg); break; case MEDIA_SERVER_SEND_NOTIFICATIONS:
case MMEDIAFILESMANAGER_SAVE_TIMER: gMMediaFilesManager->TimerMessage(); break; gNotificationManager->EnqueueMessage(msg);
default: inherited::MessageReceived(msg); break; 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"); //printf("\nnew media server: unknown message received\n");
//msg->PrintToStream(); //msg->PrintToStream();
break;
} }
TRACE("ServerApp::MessageReceived %lx leave\n", msg->what); TRACE("ServerApp::MessageReceived %lx leave\n", msg->what);
} }
int main() int
main()
{ {
new ServerApp; new ServerApp;
be_app->Run(); be_app->Run();