SDL_sound_CoreAudio: playsound/playsound.c annotate

annotate playsound/playsound.c @ 320:8195b86207bb

Mac fixes, and removed all alloca() calls.

author	Ryan C. Gordon <icculus@icculus.org>
date	Mon, 29 Apr 2002 06:03:03 +0000
parents	9e21cb0d3ae7
children	f0f894d897bf

rev	line source
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	1 /*
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	2 * SDL_sound -- An abstract sound format decoding API.
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	3 * Copyright (C) 2001 Ryan C. Gordon.
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	4 *
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	5 * This library is free software; you can redistribute it and/or
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	6 * modify it under the terms of the GNU Lesser General Public
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	7 * License as published by the Free Software Foundation; either
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	8 * version 2.1 of the License, or (at your option) any later version.
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	9 *
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	10 * This library is distributed in the hope that it will be useful,
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	13 * Lesser General Public License for more details.
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	14 *
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	15 * You should have received a copy of the GNU Lesser General Public
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	16 * License along with this library; if not, write to the Free Software
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	18 */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	19
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	20 /**
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	21 * This is a quick and dirty test of SDL_sound.
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	22 *
184 47cc2de2ae36 Changed reference to "LICENSE" file to "COPYING". Ryan C. Gordon <icculus@icculus.org> parents: 176 diff changeset	23 * Please see the file COPYING in the source's root directory.
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	24 *
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	25 * This file written by Ryan C. Gordon. (icculus@clutteredmind.org)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	26 */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	27
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	28 #include <stdio.h>
270 cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	29 #include <stdlib.h>
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	30 #include <string.h>
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	31 #include <assert.h>
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	32 #include <signal.h>
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	33 #include "SDL.h"
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	34 #include "SDL_sound.h"
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	35
283 6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	36 #if SUPPORT_PHYSFS
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	37 #include "physfs.h"
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	38 #include "physfsrwops.h"
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	39 #endif
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	40
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	41 #define DEFAULT_DECODEBUF 16384
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	42 #define DEFAULT_AUDIOBUF 4096
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	43
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	44 #define PLAYSOUND_VER_MAJOR 0
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	45 #define PLAYSOUND_VER_MINOR 1
252 c54eae85f5f1 Upped version to 0.1.5. Ryan C. Gordon <icculus@icculus.org> parents: 236 diff changeset	46 #define PLAYSOUND_VER_PATCH 5
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	47
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	48 static void output_versions(const char *argv0)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	49 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	50 Sound_Version compiled;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	51 Sound_Version linked;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	52 SDL_version sdl_compiled;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	53 const SDL_version *sdl_linked;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	54
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	55 SOUND_VERSION(&compiled);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	56 Sound_GetLinkedVersion(&linked);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	57 SDL_VERSION(&sdl_compiled);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	58 sdl_linked = SDL_Linked_Version();
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	59
176 69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	60 printf("%s version %d.%d.%d\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	61 "Copyright 2001 Ryan C. Gordon\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	62 "This program is free software, covered by the GNU Lesser General\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	63 "Public License, and you are welcome to change it and/or\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	64 "distribute copies of it under certain conditions. There is\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	65 "absolutely NO WARRANTY for this program.\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	66 "\n"
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	67 " Compiled against SDL_sound version %d.%d.%d,\n"
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	68 " and linked against %d.%d.%d.\n"
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	69 " Compiled against SDL version %d.%d.%d,\n"
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	70 " and linked against %d.%d.%d.\n\n",
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	71 argv0,
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	72 PLAYSOUND_VER_MAJOR, PLAYSOUND_VER_MINOR, PLAYSOUND_VER_PATCH,
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	73 compiled.major, compiled.minor, compiled.patch,
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	74 linked.major, linked.minor, linked.patch,
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	75 sdl_compiled.major, sdl_compiled.minor, sdl_compiled.patch,
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	76 sdl_linked->major, sdl_linked->minor, sdl_linked->patch);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	77 } /* output_versions */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	78
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	79
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	80 static void output_decoders(void)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	81 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	82 const Sound_DecoderInfo **rc = Sound_AvailableDecoders();
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	83 const Sound_DecoderInfo **i;
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	84 const char **ext;
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	85
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	86 printf("Supported sound formats:\n");
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	87 if (rc == NULL)
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	88 printf(" * Apparently, NONE!\n");
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	89 else
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	90 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	91 for (i = rc; *i != NULL; i++)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	92 {
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	93 printf(" * %s\n", (*i)->description);
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	94 for (ext = (i)->extensions; ext != NULL; ext++)
150 033afe96afbc Commenting and fixes for the audio callback. Ryan C. Gordon <icculus@icculus.org> parents: 148 diff changeset	95 printf(" File extension \"%s\"\n", *ext);
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	96 printf(" Written by %s.\n %s\n\n", (i)->author, (i)->url);
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	97 } /* for */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	98 } /* else */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	99
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	100 printf("\n");
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	101 } /* output_decoders */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	102
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	103
176 69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	104 static void output_usage(const char *argv0)
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	105 {
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	106 fprintf(stderr,
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	107 "USAGE: %s [...options...] [soundFile1] ... [soundFileN]\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	108 "\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	109 " Options:\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	110 " --rate n Playback at sample rate of n HZ.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	111 " --format fmt Playback in fmt format (see below).\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	112 " --channels n Playback on n channels (1 or 2).\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	113 " --decodebuf n Buffer n decoded bytes at a time (default %d).\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	114 " --audiobuf n Buffer n samples to audio device (default %d).\n"
270 cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	115 " --volume n Playback volume multiplier (default 1.0).\n"
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	116 " --stdin [ext] Read from stdin (treat data as format [ext])\n"
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	117 " --version Display version information and exit.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	118 " --decoders List supported data formats and exit.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	119 " --predecode Decode entire sample before playback.\n"
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	120 " --loop n Loop playback n times.\n"
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	121 " --seek list List of seek points and playback durations.\n"
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	122 " --credits Shameless promotion.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	123 " --help Display this information and exit.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	124 "\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	125 " Valid arguments to the --format option are:\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	126 " U8 Unsigned 8-bit.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	127 " S8 Signed 8-bit.\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	128 " U16LSB Unsigned 16-bit (least significant byte first).\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	129 " U16MSB Unsigned 16-bit (most significant byte first).\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	130 " S16LSB Signed 16-bit (least significant byte first).\n"
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	131 " S16MSB Signed 16-bit (most significant byte first).\n"
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	132 "\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	133 " Valid arguments to the --seek options look like:\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	134 " --seek=\"mm:ss;mm:ss;mm:ss\"\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	135 " Where the first \"mm:ss\" is the position, in minutes and\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	136 " seconds to seek to at start of playback. The second mm:ss\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	137 " is how long to play audio from that point. The third mm:ss\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	138 " is another seek after the duration of playback has completed.\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	139 " If the final playback duration is omitted, playback continues\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	140 " until the end of the file. --loop and --seek can coexist.\n"
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	141 "\n",
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	142 argv0, DEFAULT_DECODEBUF, DEFAULT_AUDIOBUF);
176 69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	143 } /* output_usage */
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	144
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	145
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	146 static void output_credits(void)
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	147 {
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	148 printf("playsound version %d.%d.%d\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	149 "Copyright 2001 Ryan C. Gordon\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	150 "playsound is free software, covered by the GNU Lesser General\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	151 "Public License, and you are welcome to change it and/or\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	152 "distribute copies of it under certain conditions. There is\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	153 "absolutely NO WARRANTY for playsound.\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	154 "\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	155 " Written by Ryan C. Gordon, Torbj�rn Andersson, Max Horn,\n"
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	156 " Tsuyoshi Iguchi, Tyler Montbriand, Darrell Walisser,\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	157 " and a cast of thousands.\n"
176 69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	158 "\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	159 " Website and source code: http://icculus.org/SDL_sound/\n"
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	160 "\n",
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	161 PLAYSOUND_VER_MAJOR, PLAYSOUND_VER_MINOR, PLAYSOUND_VER_PATCH);
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	162 } /* output_credits */
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	163
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	164
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	165
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	166 /* archive stuff... */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	167
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	168 static int init_archive(const char *argv0)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	169 {
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	170 int retval = 1;
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	171
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	172 #if SUPPORT_PHYSFS
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	173 retval = PHYSFS_init(argv0);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	174 if (!retval)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	175 {
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	176 fprintf(stderr, "Couldn't init PhysicsFS: %s\n",
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	177 PHYSFS_getLastError());
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	178 } /* if */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	179 #endif
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	180
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	181 return(retval);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	182 } /* init_archive */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	183
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	184
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	185 #if SUPPORT_PHYSFS
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	186 static SDL_RWops rwops_from_physfs(const char filename)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	187 {
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	188 SDL_RWops *retval = NULL;
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	189
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	190 char path = (char ) malloc(strlen(filename) + 1);
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	191 char *archive;
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	192
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	193 if (path == NULL)
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	194 {
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	195 fprintf(stderr, "Out of memory!\n");
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	196 return(NULL);
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	197 } /* if */
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	198
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	199 strcpy(path, filename);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	200 archive = strchr(path, '@');
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	201 if (archive != NULL)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	202 {
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	203 (archive++) = '\0'; / blank '@', point to archive name. */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	204 if (!PHYSFS_addToSearchPath(archive, 0))
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	205 {
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	206 fprintf(stderr, "Couldn't open archive: %s\n",
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	207 PHYSFS_getLastError());
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	208 free(path);
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	209 return(NULL);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	210 } /* if */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	211
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	212 retval = PHYSFSRWOPS_openRead(path);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	213 } /* if */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	214
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	215 free(path);
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	216 return(retval);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	217 } /* rwops_from_physfs */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	218 #endif
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	219
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	220
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	221 static Sound_Sample sample_from_archive(const char fname,
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	222 Sound_AudioInfo *desired,
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	223 Uint32 decode_buffersize)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	224 {
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	225 Sound_Sample *retval = NULL;
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	226
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	227 #if SUPPORT_PHYSFS
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	228 SDL_RWops *rw = rwops_from_physfs(fname);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	229 if (rw != NULL)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	230 {
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	231 char path = (char ) malloc(strlen(fname) + 1);
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	232 char *ptr;
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	233 strcpy(path, fname);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	234 ptr = strchr(path, '@');
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	235 *ptr = '\0';
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	236 ptr = strrchr(path, '.');
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	237 if (ptr != NULL)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	238 ptr++;
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	239
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	240 retval = Sound_NewSample(rw, ptr, desired, decode_buffersize);
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	241 free(path);
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	242 } /* if */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	243 #endif
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	244
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	245 return(retval);
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	246 } /* sample_from_archive */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	247
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	248
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	249 static void close_archive(const char *filename)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	250 {
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	251 #if SUPPORT_PHYSFS
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	252 char *archive_name = strchr(filename, '@');
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	253 if (archive_name != NULL)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	254 PHYSFS_removeFromSearchPath(archive_name + 1);
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	255 #endif
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	256 } /* close_archive */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	257
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	258
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	259 static void deinit_archive(void)
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	260 {
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	261 #if SUPPORT_PHYSFS
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	262 PHYSFS_deinit();
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	263 #endif
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	264 } /* deinit_archive */
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	265
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	266
414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	267
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	268 static volatile int done_flag = 0;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	269
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	270
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	271 void sigint_catcher(int signum)
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	272 {
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	273 static Uint32 last_sigint = 0;
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	274 Uint32 ticks = SDL_GetTicks();
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	275
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	276 assert(signum == SIGINT);
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	277
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	278 if ((last_sigint != 0) && (ticks - last_sigint < 500))
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	279 {
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	280 SDL_PauseAudio(1);
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	281 SDL_CloseAudio();
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	282 Sound_Quit();
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	283 SDL_Quit();
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	284 deinit_archive();
148 d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	285 exit(1);
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	286 } /* if */
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	287
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	288 else
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	289 {
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	290 last_sigint = ticks;
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	291 done_flag = 1;
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	292 } /* else */
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	293 } /* sigint_catcher */
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	294
d51546293fd1 Support for multiple file extensions in the decoders, and a SIGINT catcher. Ryan C. Gordon <icculus@icculus.org> parents: 146 diff changeset	295
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	296 /* global decoding state. */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	297 /* !!! FIXME: Put this in a struct and pass a pointer to it as the
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	298 * !!! FIXME: audio callback's argument. This will clean up the
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	299 * !!! FIXME: namespace and let me reinitialize this for each file in
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	300 * !!! FIXME: a cleaner way.
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	301 */
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	302 static volatile Uint8 *decoded_ptr = NULL;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	303 static volatile Uint32 decoded_bytes = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	304 static volatile int predecode = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	305 static volatile int looping = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	306 static volatile int wants_volume_change = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	307 static volatile float volume = 1.0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	308 static volatile Uint32 total_seeks = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	309 static volatile Uint32 *seek_list = NULL;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	310 static volatile Uint32 seek_index = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	311 static volatile Sint32 bytes_before_next_seek = -1;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	312
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	313 static Uint32 cvtMsToBytePos(Sound_AudioInfo *info, Uint32 ms)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	314 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	315 /* "frames" == "sample frames" */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	316 float frames_per_ms = ((float) info->rate) / 1000.0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	317 Uint32 frame_offset = (Uint32) (frames_per_ms * ((float) ms));
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	318 Uint32 frame_size = (Uint32) ((info->format & 0xFF) / 8) * info->channels;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	319 return(frame_offset * frame_size);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	320 } /* cvtMsToBytePos */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	321
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	322
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	323 static void do_seek(Sound_Sample *sample)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	324 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	325 printf("Seeking to %.2d:%.2d...\n",
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	326 ((seek_list[seek_index] / 1000) / 60),
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	327 ((seek_list[seek_index] / 1000) % 60));
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	328
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	329 if (predecode)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	330 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	331 Uint32 pos = cvtMsToBytePos(&sample->desired, seek_list[seek_index]);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	332 if (pos > sample->buffer_size)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	333 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	334 fprintf(stderr, "Seek past end of predecoded buffer.\n");
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	335 done_flag = 1;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	336 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	337 else
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	338 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	339 decoded_ptr = (((Uint8 *) sample->buffer) + pos);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	340 decoded_bytes = sample->buffer_size - pos;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	341 } /* else */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	342 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	343 else
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	344 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	345 if (!Sound_Seek(sample, seek_list[seek_index]))
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	346 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	347 fprintf(stderr, "Sound_Seek() failed: %s\n", Sound_GetError());
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	348 done_flag = 1;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	349 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	350 } /* else */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	351
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	352 seek_index++;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	353 if (seek_index >= total_seeks)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	354 bytes_before_next_seek = -1; /* no more seeks. */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	355 else
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	356 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	357 bytes_before_next_seek = cvtMsToBytePos(&sample->desired,
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	358 seek_list[seek_index]);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	359 seek_index++;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	360 } /* else */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	361 } /* do_seek */
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	362
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	363
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	364 /*
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	365 * This updates (decoded_bytes) and (decoded_ptr) with more audio data,
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	366 * taking into account potential looping, seeking and predecoding.
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	367 */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	368 static int read_more_data(Sound_Sample *sample)
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	369 {
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	370 if (done_flag) /* probably a sigint; stop trying to read. */
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	371 {
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	372 decoded_bytes = 0;
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	373 return(0);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	374 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	375
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	376 if ((bytes_before_next_seek >= 0) &&
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	377 (decoded_bytes > bytes_before_next_seek))
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	378 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	379 decoded_bytes = bytes_before_next_seek;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	380 } /* if */
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	381
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	382 if (decoded_bytes > 0) /* don't need more data; just return. */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	383 return(decoded_bytes);
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	384
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	385 /* Need more audio data. See if we're supposed to seek... */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	386 if ((bytes_before_next_seek == 0) && (seek_index < total_seeks))
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	387 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	388 do_seek(sample); /* do it, baby! */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	389 return(read_more_data(sample)); /* handle loops conditions. */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	390 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	391
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	392 /* See if there's more to be read... */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	393 if ( (bytes_before_next_seek != 0) &&
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	394 (!(sample->flags & (SOUND_SAMPLEFLAG_ERROR \| SOUND_SAMPLEFLAG_EOF))) )
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	395 {
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	396 decoded_bytes = Sound_Decode(sample);
272 0ac181b5adc6 Corrected error reporting to respect Sound_GetError()'s new thread Ryan C. Gordon <icculus@icculus.org> parents: 270 diff changeset	397 if (sample->flags & SOUND_SAMPLEFLAG_ERROR)
0ac181b5adc6 Corrected error reporting to respect Sound_GetError()'s new thread Ryan C. Gordon <icculus@icculus.org> parents: 270 diff changeset	398 {
0ac181b5adc6 Corrected error reporting to respect Sound_GetError()'s new thread Ryan C. Gordon <icculus@icculus.org> parents: 270 diff changeset	399 fprintf(stderr, "Error in decoding sound file!\n"
0ac181b5adc6 Corrected error reporting to respect Sound_GetError()'s new thread Ryan C. Gordon <icculus@icculus.org> parents: 270 diff changeset	400 " reason: [%s].\n", Sound_GetError());
0ac181b5adc6 Corrected error reporting to respect Sound_GetError()'s new thread Ryan C. Gordon <icculus@icculus.org> parents: 270 diff changeset	401 } /* if */
0ac181b5adc6 Corrected error reporting to respect Sound_GetError()'s new thread Ryan C. Gordon <icculus@icculus.org> parents: 270 diff changeset	402
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	403 decoded_ptr = sample->buffer;
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	404 return(read_more_data(sample)); /* handle loops conditions. */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	405 } /* if */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	406
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	407 /* No more to be read from stream, but we may want to loop the sample. */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	408
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	409 if (!looping)
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	410 return(0);
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	411
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	412 looping--;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	413
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	414 seek_index = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	415 bytes_before_next_seek = (total_seeks > 0) ? 0 : -1;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	416
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	417 /* we just need to point predecoded samples to the start of the buffer. */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	418 if (predecode)
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	419 {
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	420 decoded_bytes = sample->buffer_size;
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	421 decoded_ptr = sample->buffer;
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	422 } /* if */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	423 else
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	424 {
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	425 Sound_Rewind(sample); /* error is checked in recursion. */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	426 } /* else */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	427
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	428 return(read_more_data(sample));
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	429 } /* read_more_data */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	430
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	431
270 cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	432 static void memcpy_with_volume(Sound_Sample *sample,
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	433 Uint8 dst, Uint8 src, int len)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	434 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	435 int i;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	436 Uint16 *u16src = NULL;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	437 Uint16 *u16dst = NULL;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	438 Sint16 *s16src = NULL;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	439 Sint16 *s16dst = NULL;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	440
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	441 if (!wants_volume_change)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	442 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	443 memcpy(dst, src, len);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	444 return;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	445 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	446
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	447 /* !!! FIXME: This would be more efficient with a lookup table. */
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	448 switch (sample->desired.format)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	449 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	450 case AUDIO_U8:
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	451 for (i = 0; i < len; i++, src++, dst++)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	452 dst = (Uint8) (((float) (src)) * volume);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	453 break;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	454
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	455 case AUDIO_S8:
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	456 for (i = 0; i < len; i++, src++, dst++)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	457 dst = (Sint8) (((float) (src)) * volume);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	458 break;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	459
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	460 case AUDIO_U16LSB:
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	461 u16src = (Uint16 *) src;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	462 u16dst = (Uint16 *) dst;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	463 for (i = 0; i < len; i += sizeof (Uint16), u16src++, u16dst++)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	464 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	465 u16dst = (Uint16) (((float) (SDL_SwapLE16(u16src))) * volume);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	466 u16dst = SDL_SwapLE16(u16dst);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	467 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	468 break;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	469
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	470 case AUDIO_S16LSB:
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	471 s16src = (Sint16 *) src;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	472 s16dst = (Sint16 *) dst;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	473 for (i = 0; i < len; i += sizeof (Sint16), s16src++, s16dst++)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	474 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	475 s16dst = (Sint16) (((float) (SDL_SwapLE16(s16src))) * volume);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	476 s16dst = SDL_SwapLE16(s16dst);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	477 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	478 break;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	479
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	480 case AUDIO_U16MSB:
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	481 u16src = (Uint16 *) src;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	482 u16dst = (Uint16 *) dst;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	483 for (i = 0; i < len; i += sizeof (Uint16), u16src++, u16dst++)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	484 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	485 u16dst = (Uint16) (((float) (SDL_SwapBE16(u16src))) * volume);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	486 u16dst = SDL_SwapBE16(u16dst);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	487 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	488 break;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	489
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	490 case AUDIO_S16MSB:
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	491 s16src = (Sint16 *) src;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	492 s16dst = (Sint16 *) dst;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	493 for (i = 0; i < len; i += sizeof (Sint16), s16src++, s16dst++)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	494 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	495 s16dst = (Sint16) (((float) (SDL_SwapBE16(s16src))) * volume);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	496 s16dst = SDL_SwapBE16(s16dst);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	497 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	498 break;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	499 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	500 }
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	501
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	502
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	503 static void audio_callback(void userdata, Uint8 stream, int len)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	504 {
112 3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	505 Sound_Sample sample = (Sound_Sample ) userdata;
150 033afe96afbc Commenting and fixes for the audio callback. Ryan C. Gordon <icculus@icculus.org> parents: 148 diff changeset	506 int bw = 0; /* bytes written to stream this time through the callback */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	507
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	508 while (bw < len)
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	509 {
150 033afe96afbc Commenting and fixes for the audio callback. Ryan C. Gordon <icculus@icculus.org> parents: 148 diff changeset	510 int cpysize; /* bytes to copy on this iteration of the loop. */
033afe96afbc Commenting and fixes for the audio callback. Ryan C. Gordon <icculus@icculus.org> parents: 148 diff changeset	511
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	512 if (!read_more_data(sample)) /* read more data, if needed. */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	513 {
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	514 /* ...there isn't any more data to read! */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	515 memset(stream + bw, '\0', len - bw);
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	516 done_flag = 1;
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	517 return;
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	518 } /* if */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	519
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	520 /* decoded_bytes and decoder_ptr are updated as necessary... */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	521
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	522 cpysize = len - bw;
023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	523 if (cpysize > decoded_bytes)
023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	524 cpysize = decoded_bytes;
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	525
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	526 if (cpysize > 0)
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	527 {
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	528 memcpy_with_volume(sample, stream + bw,
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	529 (Uint8 *) decoded_ptr, cpysize);
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	530 bw += cpysize;
150 033afe96afbc Commenting and fixes for the audio callback. Ryan C. Gordon <icculus@icculus.org> parents: 148 diff changeset	531 decoded_ptr += cpysize;
033afe96afbc Commenting and fixes for the audio callback. Ryan C. Gordon <icculus@icculus.org> parents: 148 diff changeset	532 decoded_bytes -= cpysize;
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	533 if (bytes_before_next_seek >= 0)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	534 bytes_before_next_seek -= cpysize;
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	535 } /* if */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	536 } /* while */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	537 } /* audio_callback */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	538
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	539
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	540 static int count_seek_list(const char *list)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	541 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	542 const char *ptr;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	543 int retval = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	544
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	545 for (ptr = list; ptr != NULL; ptr = strchr(ptr + 1, ';'))
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	546 retval++;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	547
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	548 return(retval);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	549 } /* count_seek_list */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	550
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	551
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	552 static Uint32 parse_time_str(char *str)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	553 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	554 Uint32 minutes = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	555 Uint32 seconds = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	556 char *ptr = strchr(str, ':');
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	557 if (ptr != NULL)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	558 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	559 *ptr = '\0';
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	560 minutes = atoi(str);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	561 str = ptr + 1;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	562 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	563
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	564 seconds = atoi(str);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	565
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	566 return( ((minutes * 60) + seconds) * 1000 );
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	567 } /* parse_time_str */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	568
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	569
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	570 static void parse_seek_list(const char *_list)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	571 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	572 Uint32 i;
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	573
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	574 char list = (char) malloc(strlen(_list) + 1);
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	575 char *save_list = list;
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	576 if (list == NULL)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	577 {
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	578 fprintf(stderr, "malloc() failed. Skipping seek list.\n");
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	579 return;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	580 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	581
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	582 strcpy(list, _list);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	583
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	584 if (seek_list != NULL)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	585 free((void *) seek_list);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	586
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	587 total_seeks = count_seek_list(list);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	588 seek_list = (Uint32 ) malloc(total_seeks sizeof (Uint32));
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	589 if (seek_list == NULL)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	590 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	591 fprintf(stderr, "malloc() failed. Skipping seek list.\n");
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	592 total_seeks = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	593 return;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	594 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	595
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	596 for (i = 0; i < total_seeks; i++)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	597 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	598 char *ptr = strchr(list, ';');
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	599 if (ptr != NULL)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	600 *ptr = '\0';
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	601 seek_list[i] = parse_time_str(list);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	602 list = ptr + 1;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	603 } /* for */
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	604
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	605 free(save_list);
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	606 } /* parse_seek_list */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	607
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	608
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	609 static int str_to_fmt(char *str)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	610 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	611 if (strcmp(str, "U8") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	612 return AUDIO_U8;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	613 if (strcmp(str, "S8") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	614 return AUDIO_S8;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	615 if (strcmp(str, "U16LSB") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	616 return AUDIO_U16LSB;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	617 if (strcmp(str, "S16LSB") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	618 return AUDIO_S16LSB;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	619 if (strcmp(str, "U16MSB") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	620 return AUDIO_U16MSB;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	621 if (strcmp(str, "S16MSB") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	622 return AUDIO_S16MSB;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	623 return 0;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	624 } /* str_to_fmt */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	625
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	626
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	627 int main(int argc, char **argv)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	628 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	629 Sound_AudioInfo sound_desired;
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	630 Uint32 audio_buffersize = DEFAULT_AUDIOBUF;
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	631 Uint32 decode_buffersize = DEFAULT_DECODEBUF;
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	632 SDL_AudioSpec sdl_desired;
112 3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	633 SDL_AudioSpec sdl_actual;
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	634 Sound_Sample *sample;
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	635 int use_specific_audiofmt = 0;
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	636 int i;
214 e27b33a6d5fe Now attempts to wait for SDL to finish playing the end of the buffered Ryan C. Gordon <icculus@icculus.org> parents: 196 diff changeset	637 int delay;
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	638 int new_sample = 1;
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	639
168 87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	640 setbuf(stdout, NULL);
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	641 setbuf(stderr, NULL);
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	642
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	643 if (argc < 2)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	644 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	645 output_usage(argv[0]);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	646 return(42);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	647 } /* if */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	648
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	649 /* Check some command lines upfront. */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	650 for (i = 0; i < argc; i++)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	651 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	652 if (strncmp(argv[i], "--", 2) != 0)
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	653 continue;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	654
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	655 if (strcmp(argv[i], "--version") == 0)
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	656 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	657 output_versions(argv[0]);
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	658 return(42);
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	659 } /* if */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	660
176 69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	661 if (strcmp(argv[i], "--credits") == 0)
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	662 {
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	663 output_credits();
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	664 return(42);
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	665 } /* if */
69922f6a5c74 Added GNU disclaimers and a --credits option with our names. Ryan C. Gordon <icculus@icculus.org> parents: 168 diff changeset	666
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	667 else if (strcmp(argv[i], "--help") == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	668 {
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	669 output_usage(argv[0]);
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	670 return(42);
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	671 } /* if */
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	672
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	673 else if (strcmp(argv[i], "--decoders") == 0)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	674 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	675 if (!Sound_Init())
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	676 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	677 fprintf(stderr, "Sound_Init() failed!\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	678 " reason: [%s].\n", Sound_GetError());
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	679 SDL_Quit();
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	680 return(42);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	681 } /* if */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	682
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	683 output_decoders();
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	684 Sound_Quit();
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	685 return(0);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	686 } /* else if */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	687
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	688 /* !!! FIXME: Verify other --arguments are valid. */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	689 #if 0
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	690 else
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	691 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	692 fprintf(stderr, "unknown option: \"%s\"\n", argv[i]);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	693 return(42);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	694 } /* else */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	695 #endif
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	696 } /* for */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	697
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	698 if (!init_archive(argv[0]))
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	699 return(42);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	700
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	701 if (SDL_Init(SDL_INIT_AUDIO) == -1)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	702 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	703 fprintf(stderr, "SDL_Init(SDL_INIT_AUDIO) failed!\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	704 " reason: [%s].\n", SDL_GetError());
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	705 return(42);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	706 } /* if */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	707
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	708 if (!Sound_Init())
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	709 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	710 fprintf(stderr, "Sound_Init() failed!\n"
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	711 " reason: [%s].\n", Sound_GetError());
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	712 SDL_Quit();
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	713 return(42);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	714 } /* if */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	715
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	716 signal(SIGINT, sigint_catcher);
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	717
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	718 for (i = 1; i < argc; i++)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	719 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	720 char *filename = NULL;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	721
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	722 /* !!! FIXME: Go read gripe about all the global variables. */
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	723 /* set variables back to defaults for next file... */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	724 if (new_sample)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	725 {
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	726 new_sample = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	727 memset(&sound_desired, '\0', sizeof (sound_desired));
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	728 done_flag = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	729 decoded_ptr = NULL;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	730 decoded_bytes = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	731 predecode = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	732 looping = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	733 audio_buffersize = DEFAULT_AUDIOBUF;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	734 decode_buffersize = DEFAULT_DECODEBUF;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	735 sample = NULL;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	736 use_specific_audiofmt = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	737 wants_volume_change = 0;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	738 volume = 1.0;
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	739 if (seek_list != NULL)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	740 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	741 free((void *) seek_list);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	742 seek_list = NULL;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	743 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	744 total_seeks = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	745 seek_index = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	746 bytes_before_next_seek = -1;
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	747 } /* if */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	748
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	749 if (strcmp(argv[i], "--rate") == 0 && argc > i + 1)
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	750 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	751 use_specific_audiofmt = 1;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	752 sound_desired.rate = atoi(argv[++i]);
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	753 if (sound_desired.rate <= 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	754 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	755 fprintf(stderr, "Bad argument to --rate!\n");
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	756 return(42);
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	757 } /* if */
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	758 } /* else if */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	759
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	760 else if (strcmp(argv[i], "--format") == 0 && argc > i + 1)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	761 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	762 use_specific_audiofmt = 1;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	763 sound_desired.format = str_to_fmt(argv[++i]);
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	764 if (sound_desired.format == 0)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	765 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	766 fprintf(stderr, "Bad argument to --format! Try one of:\n"
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	767 "U8, S8, U16LSB, S16LSB, U16MSB, S16MSB\n");
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	768 return(42);
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	769 } /* if */
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	770 } /* else if */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	771
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	772 else if (strcmp(argv[i], "--channels") == 0 && argc > i + 1)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	773 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	774 use_specific_audiofmt = 1;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	775 sound_desired.channels = atoi(argv[++i]);
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	776 if (sound_desired.channels < 1 \|\| sound_desired.channels > 2)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	777 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	778 fprintf(stderr,
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	779 "Bad argument to --channels! Try 1 (mono) or 2 "
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	780 "(stereo).\n");
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	781 return(42);
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	782 } /* if */
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	783 } /* else if */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	784
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	785 else if (strcmp(argv[i], "--audiobuf") == 0 && argc > i + 1)
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	786 {
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	787 audio_buffersize = atoi(argv[++i]);
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	788 } /* else if */
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	789
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	790 else if (strcmp(argv[i], "--decodebuf") == 0 && argc > i + 1)
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	791 {
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	792 decode_buffersize = atoi(argv[++i]);
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	793 } /* else if */
bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	794
270 cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	795 else if (strcmp(argv[i], "--volume") == 0 && argc > i + 1)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	796 {
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	797 volume = atof(argv[++i]);
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	798 if (volume != 1.0)
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	799 wants_volume_change = 1;
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	800 } /* else if */
cf8c0bbbdc19 --volume control. Ryan C. Gordon <icculus@icculus.org> parents: 252 diff changeset	801
168 87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	802 else if (strcmp(argv[i], "--predecode") == 0)
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	803 {
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	804 predecode = 1;
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	805 } /* else if */
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	806
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	807 else if (strcmp(argv[i], "--loop") == 0)
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	808 {
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	809 looping = atoi(argv[++i]);
222 d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	810 } /* else if */
d6b24586822a Support for looping sounds via a new --loop command line. Rewritten (again!) Ryan C. Gordon <icculus@icculus.org> parents: 214 diff changeset	811
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	812 else if (strcmp(argv[i], "--seek") == 0)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	813 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	814 parse_seek_list(argv[++i]);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	815 } /* else if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	816
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	817 else if (strcmp(argv[i], "--stdin") == 0)
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	818 {
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	819 SDL_RWops *rw = SDL_RWFromFP(stdin, 1);
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	820 filename = "...from stdin...";
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	821
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	822 /*
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	823 * The second argument will be NULL if --stdin is the last
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	824 * thing on the command line. This is correct behaviour.
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	825 */
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	826 sample = Sound_NewSample(rw, argv[++i],
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	827 use_specific_audiofmt ? &sound_desired : NULL,
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	828 decode_buffersize);
283 6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	829 } /* if */
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	830
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	831 else if (strncmp(argv[i], "--", 2) == 0)
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	832 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	833 /* ignore it. */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	834 } /* else if */
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	835
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	836 else
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	837 {
06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	838 filename = argv[i];
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	839 sample = sample_from_archive(filename,
283 6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	840 use_specific_audiofmt ? &sound_desired : NULL,
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	841 decode_buffersize);
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	842
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	843 if (sample == NULL)
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	844 {
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	845 sample = Sound_NewSampleFromFile(filename,
283 6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	846 use_specific_audiofmt ? &sound_desired : NULL,
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	847 decode_buffersize);
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	848 } /* if */
6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	849 } /* else */
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	850
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	851 if (filename == NULL) /* still parsing command line stuff? */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	852 continue;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	853
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	854 new_sample = 1;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	855
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	856 if (sample == NULL)
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	857 {
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	858 fprintf(stderr, "Couldn't load \"%s\"!\n"
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	859 " reason: [%s].\n",
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	860 filename, Sound_GetError());
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	861 continue;
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	862 } /* if */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	863
310 9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	864 if (total_seeks > 0)
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	865 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	866 if ((!predecode) && (!(sample->flags & SOUND_SAMPLEFLAG_CANSEEK)))
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	867 {
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	868 fprintf(stderr, "Want seeks, but sample cannot handle it!\n");
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	869 Sound_FreeSample(sample);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	870 close_archive(filename);
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	871 continue;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	872 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	873
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	874 bytes_before_next_seek = 0;
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	875 } /* if */
9e21cb0d3ae7 Seek support added. Ryan C. Gordon <icculus@icculus.org> parents: 308 diff changeset	876
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	877 /*
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	878 * Unless explicitly specified, pick the format from the sound
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	879 * to be played.
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	880 */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	881 if (use_specific_audiofmt)
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	882 {
308 6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	883 /* Pick sensible default for any value not explicitly specified. */
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	884 if (sound_desired.rate == 0)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	885 sound_desired.rate = 44100;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	886 if (sound_desired.format == 0)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	887 sound_desired.format = AUDIO_S16SYS;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	888 if (sound_desired.channels == 0)
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	889 sound_desired.channels = 2;
6a80b2f9c47c Command line updates, added Darrell to the credits, and cleaned up other Ryan C. Gordon <icculus@icculus.org> parents: 302 diff changeset	890
135 69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	891 sdl_desired.freq = sound_desired.rate;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	892 sdl_desired.format = sound_desired.format;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	893 sdl_desired.channels = sound_desired.channels;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	894 } /* if */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	895 else
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	896 {
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	897 sdl_desired.freq = sample->actual.rate;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	898 sdl_desired.format = sample->actual.format;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	899 sdl_desired.channels = sample->actual.channels;
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	900 } /* else */
69cd80e80363 Added Torbj�rn Andersson's command lines, and cleaned up the usage output. Ryan C. Gordon <icculus@icculus.org> parents: 112 diff changeset	901
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	902 sdl_desired.samples = audio_buffersize;
112 3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	903 sdl_desired.callback = audio_callback;
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	904 sdl_desired.userdata = sample;
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	905
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	906 if (SDL_OpenAudio(&sdl_desired, NULL) < 0)
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	907 {
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	908 fprintf(stderr, "Couldn't open audio device!\n"
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	909 " reason: [%s].\n", SDL_GetError());
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	910 Sound_Quit();
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	911 SDL_Quit();
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	912 return(42);
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	913 } /* if */
3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	914
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	915 printf("Now playing [%s]...\n", filename);
112 3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	916
168 87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	917 if (predecode)
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	918 {
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	919 printf(" predecoding...");
168 87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	920 decoded_bytes = Sound_DecodeAll(sample);
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	921 decoded_ptr = sample->buffer;
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	922 if (sample->flags & SOUND_SAMPLEFLAG_ERROR)
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	923 {
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	924 fprintf(stderr,
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	925 "Couldn't fully decode \"%s\"!\n"
187 bfe5031726e8 printf() fix (extra comma was in there), and --decodebuf/--audiobuf Ryan C. Gordon <icculus@icculus.org> parents: 184 diff changeset	926 " reason: [%s].\n"
168 87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	927 " (playing first %lu bytes of decoded data...)\n",
280 06fbb106a554 Can now read from stdin. Ryan C. Gordon <icculus@icculus.org> parents: 272 diff changeset	928 filename, Sound_GetError(), decoded_bytes);
168 87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	929 } /* if */
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	930 else
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	931 {
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	932 printf("done.\n");
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	933 } /* else */
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	934 } /* if */
87b00f023710 Added --predecode functionality. Ryan C. Gordon <icculus@icculus.org> parents: 150 diff changeset	935
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	936 SDL_PauseAudio(0);
320 8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	937 #if ENABLE_EVENTS
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	938 {
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	939 SDL_Surface *screen;
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	940 SDL_Event event;
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	941
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	942 screen = SDL_SetVideoMode (320, 240, 8, 0);
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	943
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	944 while (!done_flag) {
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	945
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	946 SDL_Delay(1);
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	947 SDL_PollEvent (&event);
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	948
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	949 if (event.type == SDL_KEYDOWN) {
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	950
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	951 done_flag = 1;
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	952 break;
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	953 }
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	954
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	955 }
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	956 }
8195b86207bb Mac fixes, and removed all alloca() calls. Ryan C. Gordon <icculus@icculus.org> parents: 310 diff changeset	957 #endif /* ENABLE_EVENTS */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	958 while (!done_flag)
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	959 {
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	960 SDL_Delay(10);
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	961 } /* while */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	962 SDL_PauseAudio(1);
146 023c3e7f028b Cleaned up the overflow buffer hack. Ryan C. Gordon <icculus@icculus.org> parents: 144 diff changeset	963
236 034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	964 /*
034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	965 * Sleep two buffers' worth of audio before closing, in order
034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	966 * to allow the playback to finish. This isn't always enough;
034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	967 * perhaps SDL needs a way to explicitly wait for device drain?
034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	968 */
034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	969 delay = 2 * 1000 * sdl_desired.samples / sdl_desired.freq;
034b2e56f405 Fixed some tabs. Ryan C. Gordon <icculus@icculus.org> parents: 222 diff changeset	970 SDL_Delay(delay);
214 e27b33a6d5fe Now attempts to wait for SDL to finish playing the end of the buffered Ryan C. Gordon <icculus@icculus.org> parents: 196 diff changeset	971
112 3fcb23da06ba Made more robust; fixes most sample rate, etc incompatibilities. Ryan C. Gordon <icculus@icculus.org> parents: 82 diff changeset	972 SDL_CloseAudio(); /* reopen with next sample's format if possible */
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	973 Sound_FreeSample(sample);
283 6c059c4d2cea Added PhysicsFS support. Ryan C. Gordon <icculus@icculus.org> parents: 280 diff changeset	974
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	975 close_archive(filename);
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	976 } /* for */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	977
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	978 Sound_Quit();
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	979 SDL_Quit();
302 414cfef0978e Cleaned up archive support. Fixes segfault when playing non-archived Ryan C. Gordon <icculus@icculus.org> parents: 288 diff changeset	980 deinit_archive();
58 4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	981 return(0);
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	982 } /* main */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	983
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	984 /* end of playsound.c ... */
4a51162099e0 Renamed from test/test_sdlsound.c ... lots of other updates, too. Ryan C. Gordon <icculus@icculus.org> parents: diff changeset	985

Mercurial > SDL_sound_CoreAudio

annotate playsound/playsound.c @ 320:8195b86207bb