From 27d7456273e4bc3725d2d1d17ed273b43a9f8aea Mon Sep 17 00:00:00 2001 From: mahlzeit Date: Tue, 5 Nov 2002 17:39:20 +0000 Subject: [PATCH] Got rid of the .rsrc file for now, because it is rather unconvenient to update from the CVS. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1852 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/midi/MidiServerApp.cpp | 63 +++++++++++------------------ src/servers/midi/MidiServerApp.h | 26 +++++++----- src/servers/midi/midi_server.rsrc | Bin 5494 -> 0 bytes 3 files changed, 40 insertions(+), 49 deletions(-) delete mode 100644 src/servers/midi/midi_server.rsrc diff --git a/src/servers/midi/MidiServerApp.cpp b/src/servers/midi/MidiServerApp.cpp index a039ecdc7b..e520907b08 100644 --- a/src/servers/midi/MidiServerApp.cpp +++ b/src/servers/midi/MidiServerApp.cpp @@ -10,18 +10,18 @@ #include "MidiServerApp.h" //------------------------------------------------------------------------------ -//Constructor + MidiServerApp::MidiServerApp() - : BApplication("application/x-vnd.obos-midi-roster") + : BApplication(MIDI_SERVER_SIGNATURE) { - roster = new BMidiRoster(); + //roster = new BMidiRoster(); } //------------------------------------------------------------------------------ -//Destructor -MidiRosterApp:: ~MidiRosterApp(void) -{//ToTest - delete EndPointList; + +MidiServerApp::~MidiServerApp(void) +{ + //delete endpoints; } //------------------------------------------------------------------------------ @@ -36,28 +36,29 @@ void MidiServerApp::AboutRequested() //------------------------------------------------------------------------------ -void MidiServerApp::MessageReceived(BMessage *msg) -{//ToDo +void MidiServerApp::MessageReceived(BMessage* msg) +{ switch (msg->what) { - default : BApplication::MessageReceived(msg); + default: super::MessageReceived(msg); break; } } //------------------------------------------------------------------------------ -int32 MidiServerApp::GetNextFreeID(void) -{//ToTest - return NextFreeID++; -} +/*int32 MidiServerApp::GetNextFreeID() +{ + return nextFreeID++; +}*/ //------------------------------------------------------------------------------ -BMidiEndpoint *MidiServerApp::NextEndPoint(int32 *id) -{//ToTest -int32 item = 0; -BMidiEndpoint *endpoint; - while ((endpoint = (BMidiEndpoint*)EndPointList->ItemAt(item)) != NULL) +/*BMidiEndpoint* MidiServerApp::NextEndPoint(int32* id) +{ + int32 item = 0; + BMidiEndpoint *endpoint; + + while ((endpoint = (BMidiEndpoint*) endpoints->ItemAt(item)) != NULL) { if (endpoint->ID() > *id) { @@ -67,32 +68,16 @@ BMidiEndpoint *endpoint; } item++; } -return NULL; -} + return NULL; +}*/ //------------------------------------------------------------------------------ -BMidiRoster *MidiServerApp::GetRoster() +/*BMidiRoster* MidiServerApp::GetRoster() { return roster; -} +}*/ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ //------------------------------------------------------------------------------ int main() diff --git a/src/servers/midi/MidiServerApp.h b/src/servers/midi/MidiServerApp.h index 69091a6551..63d618ab74 100644 --- a/src/servers/midi/MidiServerApp.h +++ b/src/servers/midi/MidiServerApp.h @@ -2,6 +2,7 @@ * @file MidiServerApp.h * * @author Matthijs Hollemans + * @author Jerome Leveque */ #ifndef MIDI_SERVER_APP_H @@ -9,6 +10,8 @@ #include +#define MIDI_SERVER_SIGNATURE "application/x-vnd.OpenBeOS-midi-server" + /** * The BApplication that drives the midi_server. */ @@ -16,20 +19,23 @@ class MidiServerApp : public BApplication { public: MidiServerApp(); + virtual ~MidiServerApp(); + virtual void AboutRequested(); + virtual void MessageReceived(BMessage* msg); - int32 GetNextFreeID(void); - BMidiEndpoint *NextEndPoint(int32 *id); - BMidiRoster *GetRoster(); - - void MessageReceived(BMessage *msg); - + //int32 GetNextFreeID(); + //BMidiEndpoint* NextEndPoint(int32* id); + //BMidiRoster* GetRoster(); private: - BList *EndPointList; - int32 NextFreeID; - BMidiRoster *roster; - + + /** Our superclass. */ + typedef BApplication super; + + //BList* endpoints; + //int32 nextFreeID; + //BMidiRoster* roster; }; #endif // MIDI_SERVER_APP_H diff --git a/src/servers/midi/midi_server.rsrc b/src/servers/midi/midi_server.rsrc deleted file mode 100644 index d1055352214a123b8e8d550dba158c36be9822d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5494 zcmeHLzi-<{6n=7K({}wsic=Ve0)>EX5@gwdJ2(hHNVaSUuq{DUT^Ak%N>&n~){ja; z(xRHesY9m#MTcz8Pzf3QHx%xY$sRd$>(c)q8~fh7BSl&A;vz)~=wOlW?)%>N-W`vR zCi4aWgt9vto_6RrgNHjb@&)w$`<~Qz7LYa#JJ@LaL)hOv00^j9Z*dYq83r!U{%uNj zj_2{Lfa4{!kx%V-8Q=?P!jEX*SN6|n|K$qd*oVxYLQeGM!cW#=vJR6yFxdl>J#hOT z@I99JF-DIv^*EDGljEIMU|M<6T9QrY{FiI%Ya0r>W!wQ*3@wzX501ZG~QjvtuJBF)bt7Y&sgeOigUXm$Jlh=XM5Q39O#Io*T1j`bFfq?`P z7^Vx#8UkNY6s!aJ55qP}fYOliApLwt&QsS_bO-Zs#U;t&G+kKkHIA)d3l|3)=S~NT zFym<;6X!iZiGVL}pz@cn=Q}WHS#Tl1yCef>U=gaW*kJI#u;PhC!bx0Q#VOc%`20<` z+g*QybGmk%m-t4xg68@8AC{$27hmgs>2*(RyW5|2dP}RIJ>EQeW_P=`HSajD7gjZB zY&~AUEqJl$IPqRcTh?G1W>zj1E}i&0>)px>;D`pHbLw87SpCmHTLsX1&J}g>ueSo) z=P%LwA$PA&dJ7M*>o`|e(=^gwxO`1rYKg?<94e1(X0v%#Et{Qcqn`La{=9y=)+jaF z@mlq?8gDh)ok|NfQrTU6)ZBMpJp(*)dR8mY3uv=?Ru0VV?HLEZV(-&x&3sx>N~ub` zRPEHv<|{;`O7Iog)B>O63&wV6x_oA~+p{>3N--CnS4)NE!ge|znkhbMnY9Yj`S3mo z@IJY`cbMG|YQ=K9X_hM_Cr4(BrP`A-^J$x&i*jhL*lN5e{m`kjBRIBL_&S-Vm+a}{ zso623A7{fvVKg%u#TJdyon{X)ZYljr`Iyr0hjDL>lz!J+ z=Z!a7`VmJ&cj1xJ&-xNZ4psKy(ogyMBnTfW{fy%bl!T1q2%09Beu-o0$1L15&~i(^ zf@3)1qAFJ|{Vt5v4_!#YWuZej?1S-&O%XvSjywv%I90qs>1R}@BQ_#1OxIhLelLPP z2By+4#dQfs$CQ4{0nAcGkK%rE#bpRA{TRcAb_OTXvp zGiYC{((fC+VRGreG4?OJSR}a21Y4DIhmw#@78%&h<&soLxR^jHoi!dMbGhQ~esa&? z|BC1;9Vrrh#0w8dN9nwg$sT&N!|Zm3${2lL3`yGlBcrfW%xwEv+nEDmQAJa%gHe`o zkU5~7=mlVL5You(dEuxS6NNsLDxuxXe!5urCYLsVa-}b+OYl|w+j`?gJ(4rA&U@Z( KgFpR=F#H36tn17G