[Scummvm-cvs-logs] CVS: scummvm/sound adpcm.cpp,1.3,1.4 adpcm.h,1.2,1.3 audiocd.cpp,1.20,1.21 audiocd.h,1.12,1.13 audiostream.cpp,1.73,1.74 audiostream.h,1.46,1.47 flac.h,1.4,1.5 fmopl.cpp,1.29,1.30 mididrv.cpp,1.63,1.64 midiparser.cpp,1.26,1.27 midiparser_smf.cpp,1.22,1.23 midiparser_xmidi.cpp,1.19,1.20 mixer.cpp,1.192,1.193 mixer.h,1.106,1.107 mp3.h,1.10,1.11 mpu401.cpp,1.29,1.30 mpu401.h,1.23,1.24 rate.cpp,1.39,1.40 voc.cpp,1.26,1.27 voc.h,1.17,1.18 vorbis.h,1.10,1.11 wave.cpp,1.6,1.7 wave.h,1.3,1.4

Max Horn fingolfin at users.sourceforge.net
Fri Jun 24 08:27:11 CEST 2005


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17960/sound

Modified Files:
	adpcm.cpp adpcm.h audiocd.cpp audiocd.h audiostream.cpp 
	audiostream.h flac.h fmopl.cpp mididrv.cpp midiparser.cpp 
	midiparser_smf.cpp midiparser_xmidi.cpp mixer.cpp mixer.h 
	mp3.h mpu401.cpp mpu401.h rate.cpp voc.cpp voc.h vorbis.h 
	wave.cpp wave.h 
Log Message:
When including files from common/, explicitly use the common/ prefix

Index: adpcm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adpcm.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- adpcm.cpp	8 May 2005 21:49:50 -0000	1.3
+++ adpcm.cpp	24 Jun 2005 15:23:45 -0000	1.4
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/stream.h"
 
 #include "sound/audiostream.h"

Index: adpcm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/adpcm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- adpcm.h	3 May 2005 22:12:23 -0000	1.2
+++ adpcm.h	24 Jun 2005 15:23:46 -0000	1.3
@@ -22,7 +22,7 @@
 #ifndef SOUND_ADPCM_H
 #define SOUND_ADPCM_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 class AudioStream;

Index: audiocd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- audiocd.cpp	20 Apr 2005 11:13:55 -0000	1.20
+++ audiocd.cpp	24 Jun 2005 15:23:46 -0000	1.21
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "sound/audiocd.h"
 #include "sound/mp3.h"

Index: audiocd.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- audiocd.h	11 May 2005 00:01:34 -0000	1.12
+++ audiocd.h	24 Jun 2005 15:23:46 -0000	1.13
@@ -22,7 +22,7 @@
 #ifndef SOUND_AUDIOCD_H
 #define SOUND_AUDIOCD_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/singleton.h"
 #include "sound/mixer.h"

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- audiostream.cpp	10 May 2005 23:48:45 -0000	1.73
+++ audiostream.cpp	24 Jun 2005 15:23:46 -0000	1.74
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/file.h"
 #include "common/util.h"
 #include "sound/audiostream.h"

Index: audiostream.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- audiostream.h	11 Jan 2005 08:06:19 -0000	1.46
+++ audiostream.h	24 Jun 2005 15:23:46 -0000	1.47
@@ -22,7 +22,7 @@
 #ifndef AUDIOSTREAM_H
 #define AUDIOSTREAM_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "common/scummsys.h"
 

Index: flac.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/flac.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- flac.h	10 May 2005 22:56:20 -0000	1.4
+++ flac.h	24 Jun 2005 15:23:46 -0000	1.5
@@ -22,7 +22,7 @@
 #ifndef SOUND_FLAC_H
 #define SOUND_FLAC_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #ifdef USE_FLAC

Index: fmopl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/fmopl.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- fmopl.cpp	21 Jun 2005 22:08:21 -0000	1.29
+++ fmopl.cpp	24 Jun 2005 15:23:46 -0000	1.30
@@ -22,7 +22,7 @@
  * Tatsuyuki Satoh. Included from LGPL'ed AdPlug.
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include <stdio.h>
 #include <stdlib.h>

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- mididrv.cpp	21 Jun 2005 22:08:21 -0000	1.63
+++ mididrv.cpp	24 Jun 2005 15:23:46 -0000	1.64
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "base/engine.h"
 #include "common/config-manager.h"

Index: midiparser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- midiparser.cpp	27 May 2005 12:43:19 -0000	1.26
+++ midiparser.cpp	24 Jun 2005 15:23:47 -0000	1.27
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "midiparser.h"
 #include "mididrv.h"
 #include "common/util.h"

Index: midiparser_smf.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser_smf.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- midiparser_smf.cpp	27 May 2005 12:43:19 -0000	1.22
+++ midiparser_smf.cpp	24 Jun 2005 15:23:47 -0000	1.23
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "midiparser.h"
 #include "mididrv.h"
 #include "common/util.h"

Index: midiparser_xmidi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser_xmidi.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- midiparser_xmidi.cpp	27 May 2005 12:43:19 -0000	1.19
+++ midiparser_xmidi.cpp	24 Jun 2005 15:23:47 -0000	1.20
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "midiparser.h"
 #include "mididrv.h"
 #include "common/util.h"

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- mixer.cpp	10 May 2005 23:48:45 -0000	1.192
+++ mixer.cpp	24 Jun 2005 15:23:47 -0000	1.193
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 
 #include "common/file.h"
 #include "common/util.h"

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- mixer.h	11 May 2005 00:01:35 -0000	1.106
+++ mixer.h	24 Jun 2005 15:23:47 -0000	1.107
@@ -23,7 +23,7 @@
 #ifndef SOUND_MIXER_H
 #define SOUND_MIXER_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/mutex.h"
 

Index: mp3.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mp3.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mp3.h	10 May 2005 22:56:20 -0000	1.10
+++ mp3.h	24 Jun 2005 15:23:47 -0000	1.11
@@ -22,7 +22,7 @@
 #ifndef SOUND_MP3_H
 #define SOUND_MP3_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #ifdef USE_MAD

Index: mpu401.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- mpu401.cpp	10 May 2005 23:17:37 -0000	1.29
+++ mpu401.cpp	24 Jun 2005 15:23:47 -0000	1.30
@@ -18,7 +18,7 @@
  * $Header$
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "mpu401.h"
 #include "common/timer.h"
 #include "common/util.h"	// for ARRAYSIZE

Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mpu401.h	10 May 2005 23:17:37 -0000	1.23
+++ mpu401.h	24 Jun 2005 15:23:47 -0000	1.24
@@ -22,7 +22,7 @@
 #ifndef SOUND_MPU401_H
 #define SOUND_MPU401_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "mididrv.h"
 
 ////////////////////////////////////////

Index: rate.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/rate.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- rate.cpp	11 May 2005 00:01:35 -0000	1.39
+++ rate.cpp	24 Jun 2005 15:23:47 -0000	1.40
@@ -27,7 +27,7 @@
  * improvments over the original code were made.
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "sound/audiostream.h"
 #include "sound/rate.h"
 #include "sound/mixer.h"

Index: voc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- voc.cpp	10 May 2005 23:48:46 -0000	1.26
+++ voc.cpp	24 Jun 2005 15:23:48 -0000	1.27
@@ -20,7 +20,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "common/stream.h"
 

Index: voc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- voc.h	9 Jan 2005 15:48:47 -0000	1.17
+++ voc.h	24 Jun 2005 15:23:48 -0000	1.18
@@ -23,7 +23,7 @@
 #ifndef SOUND_VOC_H
 #define SOUND_VOC_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 class AudioStream;

Index: vorbis.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vorbis.h	10 May 2005 22:56:20 -0000	1.10
+++ vorbis.h	24 Jun 2005 15:23:48 -0000	1.11
@@ -22,7 +22,7 @@
 #ifndef SOUND_VORBIS_H
 #define SOUND_VORBIS_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 #ifdef USE_VORBIS

Index: wave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/wave.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wave.cpp	10 May 2005 23:48:46 -0000	1.6
+++ wave.cpp	24 Jun 2005 15:23:48 -0000	1.7
@@ -19,7 +19,7 @@
  *
  */
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/util.h"
 #include "common/stream.h"
 

Index: wave.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/wave.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wave.h	3 May 2005 22:12:23 -0000	1.3
+++ wave.h	24 Jun 2005 15:23:48 -0000	1.4
@@ -22,7 +22,7 @@
 #ifndef SOUND_WAVE_H
 #define SOUND_WAVE_H
 
-#include "stdafx.h"
+#include "common/stdafx.h"
 #include "common/scummsys.h"
 
 class AudioStream;





More information about the Scummvm-git-logs mailing list