[Scummvm-cvs-logs] CVS: scummvm bundle.cpp,1.6,1.7 bundle.h,1.3,1.4

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv589

Modified Files:
	bundle.cpp bundle.h 
Log Message:
unix line endings; indent

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bundle.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- bundle.cpp	8 Aug 2002 06:49:44 -0000	1.6
+++ bundle.cpp	14 Aug 2002 09:52:43 -0000	1.7
@@ -1,646 +1,660 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002 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
[...1275 lines suppressed...]
+					t_tmp2 = *(t_table + j);
+					*(src + r + 2) = (t_tmp1 & 0xf0) >> 4;
+					*(src + r + 1) = ((t_tmp1 & 0x0f) << 4) | (t_tmp2 & 0x0f);
+				}
+				s += 12;
+				k++;
+				c += 12;
+			} while (k < t);
+		}
+		free(t_table);
+		break;
+
+	default:
+		printf("Bundle: Unknown codec %d!\n", (int)codec);
+		output_size = 0;
+		break;
+	}
+
+	return output_size;
+}

Index: bundle.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bundle.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bundle.h	4 Aug 2002 17:31:20 -0000	1.3
+++ bundle.h	14 Aug 2002 09:52:43 -0000	1.4
@@ -1,72 +1,71 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2002 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 BUNDLE_H
-#define BUNDLE_H
-
-#include "scummsys.h"
-
-struct CompTable {
-	int32 offset;
-	int32 size;
-	int32 codec;
-};
-
-struct BundleAudioTable {
-	char filename[13];
-	int32 size;
-	int32 offset;
-};
-
-class Scumm;
-
-class Bundle {
-protected:
-
-private:
-	int32 compDecode(byte * src, byte * dst);
-	int32 decompressCodec(int32 codec, byte * comp_input, byte * comp_output, int32 size);
-	CompTable _compVoiceTable[50];
-	CompTable _compMusicTable[2500];
-	FILE * _voiceFile;
-	FILE * _musicFile;
-	BundleAudioTable * _bundleVoiceTable;
-	BundleAudioTable * _bundleMusicTable;
-	int32 _numVoiceFiles;
-	int32 _numMusicFiles;
-	Scumm * _scumm;
-	int32 _lastSong;
-
-public:
-	Bundle(Scumm * parent);
-	~Bundle();
-
-	bool openVoiceFile(char * filename);
-	bool openMusicFile(char * filename);
-	int32 decompressVoiceSampleByName(char * name, byte * comp_final);
-	int32 decompressVoiceSampleByIndex(int32 index, byte * comp_final);
-	int32 decompressMusicSampleByName(char * name, int32 number, byte * comp_final);
-	int32 decompressMusicSampleByIndex(int32 index, int32 number, byte * comp_final);
-	int32 getNumberOfMusicSamplesByIndex(int32 index);
-	int32 getNumberOfMusicSamplesByName(char * name);
-};
-
-#endif
-
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2002 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 BUNDLE_H
+#define BUNDLE_H
+
+#include "scummsys.h"
+
+struct CompTable {
+	int32 offset;
+	int32 size;
+	int32 codec;
+};
+
+struct BundleAudioTable {
+	char filename[13];
+	int32 size;
+	int32 offset;
+};
+
+class Scumm;
+
+class Bundle {
+protected:
+
+private:
+	int32 compDecode(byte *src, byte *dst);
+	int32 decompressCodec(int32 codec, byte *comp_input, byte *comp_output, int32 size);
+	CompTable _compVoiceTable[50];
+	CompTable _compMusicTable[2500];
+	FILE *_voiceFile;
+	FILE *_musicFile;
+	BundleAudioTable *_bundleVoiceTable;
+	BundleAudioTable *_bundleMusicTable;
+	int32 _numVoiceFiles;
+	int32 _numMusicFiles;
+	Scumm *_scumm;
+	int32 _lastSong;
+
+public:
+	  Bundle(Scumm *parent);
+	 ~Bundle();
+
+	bool openVoiceFile(char *filename);
+	bool openMusicFile(char *filename);
+	int32 decompressVoiceSampleByName(char *name, byte *comp_final);
+	int32 decompressVoiceSampleByIndex(int32 index, byte *comp_final);
+	int32 decompressMusicSampleByName(char *name, int32 number, byte *comp_final);
+	int32 decompressMusicSampleByIndex(int32 index, int32 number, byte *comp_final);
+	int32 getNumberOfMusicSamplesByIndex(int32 index);
+	int32 getNumberOfMusicSamplesByName(char *name);
+};
+
+#endif