[Scummvm-cvs-logs] SF.net SVN: scummvm: [28389] scummvm/trunk/engines/drascula

[aquadran at users.sourceforge.net]

Revision: 28389
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28389&view=rev
Author:   aquadran
Date:     2007-08-01 13:11:32 -0700 (Wed, 01 Aug 2007)

Log Message:
-----------
added cd audio playing

Modified Paths:
--------------
    scummvm/trunk/engines/drascula/drascula.cpp
    scummvm/trunk/engines/drascula/drascula.h

Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp	2007-08-01 19:31:36 UTC (rev 28388)
+++ scummvm/trunk/engines/drascula/drascula.cpp	2007-08-01 20:11:32 UTC (rev 28389)
@@ -73,6 +73,10 @@
 			_gameId = g->id;
 
 	_rnd = new Common::RandomSource();
+
+	int cd_num = ConfMan.getInt("cdrom");
+	if (cd_num >= 0)
+		_system->openCD(cd_num);
 }
 
 DrasculaEngine::~DrasculaEngine() {
@@ -1532,6 +1536,8 @@
 	Common::Event event;
 	Common::EventManager *eventMan = _system->getEventManager();
 
+	AudioCD.updateCD();
+
 	while (eventMan->pollEvent(event)) {
 	switch (event.type) {
 		case Common::EVENT_KEYDOWN:
@@ -3080,44 +3086,16 @@
 }
 
 void DrasculaEngine::playmusic(int p) {
-// TODO
-/*	unsigned short v;
-	stopmusic();
-
-	v=GetCDVolume();
-	if ((p==12 || p==21) && !reducido) {
-		SetCDVolume(v-2);
-		reducido = 1;
-	}
-	cd_track_length(p, &min, &sec, &frame);
-	cd_set_track (p);
-	get_musicpos();
-	cd_play_audio(startpos, endpos);
-	Playing=1;
-*/
+	AudioCD.stop();
+	AudioCD.play(p - 1, 1, 0, 0);
 }
 
 void DrasculaEngine::stopmusic() {
-//TODO
-/*	unsigned short v;
-
-	cd_stop_audio ();
-	/v=GetCDVolume();
-	if (reducido)
-	{
-		SetCDVolume(v+2);
-		reducido=0;
-	}
-	cd_done_play ();
-	Playing=0;
-*/
+	AudioCD.stop();
 }
 
 int DrasculaEngine::music_status() {
-	// TODO
-	//cd_status();
-	//return ((cdrom_data.error & BUSY) != 0);
-	return 0;
+	return AudioCD.isPlaying() != 0;
 }
 
 void DrasculaEngine::refresca_pantalla() {

Modified: scummvm/trunk/engines/drascula/drascula.h
===================================================================
--- scummvm/trunk/engines/drascula/drascula.h	2007-08-01 19:31:36 UTC (rev 28388)
+++ scummvm/trunk/engines/drascula/drascula.h	2007-08-01 20:11:32 UTC (rev 28389)
@@ -40,6 +40,7 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/voc.h"
+#include "sound/audiocd.h"
 
 #include "engines/engine.h"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.