[Scummvm-cvs-logs] CVS: scummvm/sound flac.cpp,1.1,1.2 flac.h,1.1,1.2

[Torbj?rn Andersson]

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

Modified Files:
	flac.cpp flac.h 
Log Message:
Changed the UNIX line breaks.

Fixed the problem where the lookout music didn't play in the MI1CD intro.
At least, I *think* I fixed it. It worked at home, but I can't test it on
this particular computer.


Index: flac.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/flac.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac.cpp	22 Feb 2004 14:11:10 -0000	1.1
+++ flac.cpp	9 Apr 2004 07:24:08 -0000	1.2
@@ -1,840 +1,843 @@
-/* ScummVM - Scumm Interpreter

- * Copyright (C) 2003-2004 The ScummVM project

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

[...1652 lines suppressed...]
+
+	delete file;
+	return NULL;
+}
+
+AudioStream *makeFlacStream(File *file, uint32 length)
+{
+	assert(file != NULL);
+	uint32 start = file->pos();
+
+	FlacInputStream *flac = new FlacInputStream(file, start, start + length);
+	if (flac->init())
+		return flac;
+
+	delete flac;
+	return NULL;
+}
+
+
+#endif // #ifdef USE_FLAC

Index: flac.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/flac.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- flac.h	22 Feb 2004 14:11:11 -0000	1.1
+++ flac.h	9 Apr 2004 07:24:08 -0000	1.2
@@ -1,39 +1,39 @@
-/* ScummVM - Scumm Interpreter

- * Copyright (C) 2003-2004 The ScummVM project

- *

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU General Public License

- * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version.

-

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

-

- * You should have received a copy of the GNU General Public License

- * along with this program; if not, write to the Free Software

- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

- *

- * $Header$

- *

- */

-

-#ifndef SOUND_FLAC_H

-#define SOUND_FLAC_H

-

-#include "stdafx.h"

-#include "common/scummsys.h"

-

-#ifdef USE_FLAC

-

-class AudioStream;

-class DigitalTrackInfo;

-class File;

-

-DigitalTrackInfo *getFlacTrack(int track);

-

-AudioStream *makeFlacStream(File *file, uint32 size);

-

-#endif // #ifdef USE_FLAC

-#endif // #ifndef SOUND_FLAC_H

+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2003-2004 The ScummVM project
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+#ifndef SOUND_FLAC_H
+#define SOUND_FLAC_H
+
+#include "stdafx.h"
+#include "common/scummsys.h"
+
+#ifdef USE_FLAC
+
+class AudioStream;
+class DigitalTrackInfo;
+class File;
+
+DigitalTrackInfo *getFlacTrack(int track);
+
+AudioStream *makeFlacStream(File *file, uint32 size);
+
+#endif // #ifdef USE_FLAC
+#endif // #ifndef SOUND_FLAC_H