fix VC6 compile error
This commit is contained in:
@@ -2156,6 +2156,25 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.h
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\arch\Sound\RageSoundDriver_Generic_Software.cpp
|
||||||
|
|
||||||
|
!IF "$(CFG)" == "StepMania - Win32 Debug"
|
||||||
|
|
||||||
|
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
|
||||||
|
|
||||||
|
!ELSEIF "$(CFG)" == "StepMania - Win32 Release"
|
||||||
|
|
||||||
|
!ELSEIF "$(CFG)" == "StepMania - Xbox Release"
|
||||||
|
|
||||||
|
!ENDIF
|
||||||
|
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=.\arch\Sound\RageSoundDriver_Generic_Software.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp
|
SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp
|
||||||
|
|
||||||
!IF "$(CFG)" == "StepMania - Win32 Debug"
|
!IF "$(CFG)" == "StepMania - Win32 Debug"
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
|
|||||||
|
|
||||||
/* Note that, until we call advance_read_pointer, we can safely write to p[0]. */
|
/* Note that, until we call advance_read_pointer, we can safely write to p[0]. */
|
||||||
const int frames_to_read = min( frames_left, p[0]->frames_in_buffer );
|
const int frames_to_read = min( frames_left, p[0]->frames_in_buffer );
|
||||||
mix.write( p[0]->p, frames_to_read * channels, s.volume, got_frames*channels );
|
mix.write( (Sint16*)p[0]->p, frames_to_read * channels, s.volume, got_frames*channels );
|
||||||
|
|
||||||
SOUNDMAN->CommitPlayingPosition( s.sound_id, frameno+got_frames, p[0]->position, frames_to_read );
|
SOUNDMAN->CommitPlayingPosition( s.sound_id, frameno+got_frames, p[0]->position, frames_to_read );
|
||||||
|
|
||||||
@@ -117,7 +117,7 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
|
|||||||
}
|
}
|
||||||
|
|
||||||
memset( buf, 0, frames*bytes_per_frame );
|
memset( buf, 0, frames*bytes_per_frame );
|
||||||
mix.read( buf );
|
mix.read( (Sint16*)buf );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user