[Smipl-devel] SF.net SVN: smipl:[10] smipl-devel
Brought to you by:
the_student
From: <the...@us...> - 2009-07-13 20:58:46
|
Revision: 10 http://smipl.svn.sourceforge.net/smipl/?rev=10&view=rev Author: the_student Date: 2009-07-13 20:58:42 +0000 (Mon, 13 Jul 2009) Log Message: ----------- Fixed MIDI, fixed Level0.h. Modified Paths: -------------- smipl-devel/Legacy/Level0.h smipl-devel/SIASOUND.h Modified: smipl-devel/Legacy/Level0.h =================================================================== --- smipl-devel/Legacy/Level0.h 2009-07-13 20:07:47 UTC (rev 9) +++ smipl-devel/Legacy/Level0.h 2009-07-13 20:58:42 UTC (rev 10) @@ -36,10 +36,9 @@ } int Find (char *Arg1) { - cout<<"Searching"<<endl; if(!strcmp(Arg1,"ANSI")) return true; if(!strcmp(Arg1,"?")) return true; - if(MDS_Read(Arg1)!=NULL)if(MDS_Read(Arg1)->Attribute!=0) return true; + if(MDS_Read(Arg1)!=NULL) return true; else return false; } @@ -50,23 +49,11 @@ if(!strcmp(Arg1,"?")) {cout<<">";cin>>r;return r;} if(!Find(Arg1)) return atof(Arg1); MDS_Piece *DataPiece=MDS_Read(Arg1); - if(DataPiece==NULL) cout<<"Find returned true, but Arg1 was a unknown"<<endl; if(DataPiece->Attribute&MDS_READ)return DataPiece->Value; else return 0; } int Atoi(char *Arg1) {return(int)Atof(Arg1);} -void NewVar(char *Arg1, char *Arg2) { - MDS_Piece Data; - if(!strcmp(Arg1,"?")) goto end; - strcpy(Data.Name,Arg1); - Data.Value=Atof(Arg2); - Data.Attribute=MDS_READ|MDS_WRITE|MDS_DELETE; - Data.Next=NULL; - MDS_Create(Data); - delete &Data; - end: ; -} void Set(char *Arg1, char *Arg2) { if(Find(Arg1)) { MDS_Piece *DataPiece=MDS_Read(Arg1); @@ -88,7 +75,6 @@ End: ; } -<<<<<<< .mine void NewVar(char *Arg1, char *Arg2) { MDS_Piece Data; @@ -101,5 +87,3 @@ delete &Data; end: ; } -======= ->>>>>>> .r6 Modified: smipl-devel/SIASOUND.h =================================================================== --- smipl-devel/SIASOUND.h 2009-07-13 20:07:47 UTC (rev 9) +++ smipl-devel/SIASOUND.h 2009-07-13 20:58:42 UTC (rev 10) @@ -13,7 +13,7 @@ } void MIDI_Write(MIDI_Message Melding) { if(MIDI_OUT_INITED) { - write(MIDI_Out, Melding.data, sizeof(Melding)); + write(MIDI_Out, Melding.data, sizeof(Melding.data)); } } #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |