[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.26,1.27 morphos.h,1.15,1.16
Max Horn
fingolfin at users.sourceforge.net
Tue Jul 22 13:37:27 CEST 2003
Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory sc8-pr-cvs1:/tmp/cvs-serv1455/morphos
Modified Files:
morphos.cpp morphos.h
Log Message:
adjusted to play_cdrom parameter name change in common/system.h
Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- morphos.cpp 6 Jul 2003 18:56:19 -0000 1.26
+++ morphos.cpp 22 Jul 2003 20:36:43 -0000 1.27
@@ -446,7 +446,7 @@
return 0;
}
-void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int length)
+void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int duration)
{
if (CDrive && start_frame >= 0)
{
@@ -455,8 +455,8 @@
PlayTags[0].ti_Data = track;
PlayTags[1].ti_Data = start_frame;
- PlayTags[2].ti_Data = (length == 0) ? track+1 : track;
- PlayTags[3].ti_Data = length ? start_frame+length : 0;
+ PlayTags[2].ti_Data = (duration == 0) ? track+1 : track;
+ PlayTags[3].ti_Data = duration ? start_frame+duration : 0;
PlayTags[4].ti_Data = (num_loops == 0) ? 1 : num_loops;
CDDA_PlayA(CDrive, PlayTags);
}
Index: morphos.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- morphos.h 5 Jul 2003 15:17:46 -0000 1.15
+++ morphos.h 22 Jul 2003 20:36:43 -0000 1.16
@@ -112,7 +112,7 @@
virtual bool poll_cdrom();
// Play cdrom audio track
- virtual void play_cdrom(int track, int num_loops, int start_frame, int length);
+ virtual void play_cdrom(int track, int num_loops, int start_frame, int duration);
// Stop cdrom audio track
virtual void stop_cdrom();
More information about the Scummvm-git-logs
mailing list