sdl-ios-xcode: src/audio/disk/SDL

annotate src/audio/disk/SDL_diskaudio.c @ 5082:de59e0218aa2

Fixed bug #1011 Daniel Ellis 2010-06-25 15:20:31 PDT SDL based applications sometimes display the wrong application name in the Sound Preferences dialog when using pulseaudio. I can see from the code that the SDL pulse module is initiating a new pulse audio context and passing an application name using the function get_progname(). The get_progname() function returns the name of the current process. However, the process name is often not a suitable name to use. For example, the OpenShot video editor is a python application, and so "python" is displayed in the Sound Preferences window (see Bug #596504), when it should be displaying "OpenShot". PulseAudio allows applications to specify the application name, either at the time the context is created (as SDL does currently), or by special environment variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no name is specified, then pulseaudio will determine the name based on the process. If you specify the application name when initiating the pulseaudio context, then that will override any application name specified using an environment variable. As libsdl is a library, I believe the solution is for libsdl to not specify any application name when initiating a pulseaudio context, which will enable applications to specify the application name using environment variables. In the case that the applications do not specify anything, pulseaudio will fall back to using the process name anyway. The attached patch removes the get_progname() function and passes NULL as the application name when creating the pulseaudio context, which fixes the issue.

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 23 Jan 2011 21:55:04 -0800
parents	4160ba33b597
children	b530ef003506

rev	line source
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3253 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	6 modify it under the terms of the GNU Lesser General Public
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	8 version 2.1 of the License, or (at your option) any later version.
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	13 Lesser General Public License for more details.
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	15 You should have received a copy of the GNU Lesser General Public
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	16 License along with this library; if not, write to the Free Software
c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	19 Sam Lantinga
252 e8157fcb3114 Updated the source with the correct e-mail address Sam Lantinga <slouken@libsdl.org> parents: 86 diff changeset	20 slouken@libsdl.org
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21
1594 c439dad53df8 Updated my email address. Ryan C. Gordon <icculus@icculus.org> parents: 1539 diff changeset	22 This file written by Ryan C. Gordon (icculus@icculus.org)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	24 #include "SDL_config.h"
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	25
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26 /* Output raw audio data to a file. */
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	27
1465 8dfa9a6d69a5 Updated WinCE support by Dmitry (with some tweaks) Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	28 #if HAVE_STDIO_H
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	29 #include <stdio.h>
1465 8dfa9a6d69a5 Updated WinCE support by Dmitry (with some tweaks) Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	30 #endif
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	31
1465 8dfa9a6d69a5 Updated WinCE support by Dmitry (with some tweaks) Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	32 #include "SDL_rwops.h"
1358 c71e05b4dc2e More header massaging... works great on Windows. ;-) Sam Lantinga <slouken@libsdl.org> parents: 1341 diff changeset	33 #include "SDL_timer.h"
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	34 #include "SDL_audio.h"
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	35 #include "../SDL_audiomem.h"
19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1358 diff changeset	36 #include "../SDL_audio_c.h"
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	37 #include "SDL_diskaudio.h"
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	38
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	39 /* The tag name used by DISK audio */
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	40 #define DISKAUD_DRIVER_NAME "disk"
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	41
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	42 /* environment variables and defaults. */
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	43 #define DISKENVR_OUTFILE "SDL_DISKAUDIOFILE"
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	44 #define DISKDEFAULT_OUTFILE "sdlaudio.raw"
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	45 #define DISKENVR_WRITEDELAY "SDL_DISKAUDIODELAY"
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	46 #define DISKDEFAULT_WRITEDELAY 150
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	47
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	48 static const char *
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	49 DISKAUD_GetOutputFilename(const char *devname)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	50 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	51 if (devname == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	52 devname = SDL_getenv(DISKENVR_OUTFILE);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	53 if (devname == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	54 devname = DISKDEFAULT_OUTFILE;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	55 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	56 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	57 return devname;
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	58 }
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	59
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	60 /* This function waits until it is possible to write a full sound buffer */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	61 static void
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	62 DISKAUD_WaitDevice(_THIS)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	63 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	64 SDL_Delay(this->hidden->write_delay);
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	65 }
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	66
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	67 static void
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	68 DISKAUD_PlayDevice(_THIS)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	69 {
3253 5d7ef5970073 Fixed issues building 64-bit Windows binary Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	70 size_t written;
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	71
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	72 /* Write the audio data */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	73 written = SDL_RWwrite(this->hidden->output,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	74 this->hidden->mixbuf, 1, this->hidden->mixlen);
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	75
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	76 /* If we couldn't write, assume fatal error for now */
3253 5d7ef5970073 Fixed issues building 64-bit Windows binary Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	77 if (written != this->hidden->mixlen) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	78 this->enabled = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	79 }
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	80 #ifdef DEBUG_AUDIO
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	81 fprintf(stderr, "Wrote %d bytes of audio data\n", written);
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	82 #endif
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	83 }
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	84
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	85 static Uint8 *
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	86 DISKAUD_GetDeviceBuf(_THIS)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	87 {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	88 return (this->hidden->mixbuf);
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	89 }
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	90
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	91 static void
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	92 DISKAUD_CloseDevice(_THIS)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	93 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	94 if (this->hidden != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	95 if (this->hidden->mixbuf != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	96 SDL_FreeAudioMem(this->hidden->mixbuf);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	97 this->hidden->mixbuf = NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	98 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	99 if (this->hidden->output != NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	100 SDL_RWclose(this->hidden->output);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	101 this->hidden->output = NULL;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	102 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	103 SDL_free(this->hidden);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	104 this->hidden = NULL;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	105 }
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106 }
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	107
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	108 static int
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	109 DISKAUD_OpenDevice(_THIS, const char *devname, int iscapture)
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	110 {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	111 const char *envr = SDL_getenv(DISKENVR_WRITEDELAY);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	112 const char *fname = DISKAUD_GetOutputFilename(devname);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	113
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	114 this->hidden = (struct SDL_PrivateAudioData *)
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2049 diff changeset	115 SDL_malloc(sizeof(*this->hidden));
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	116 if (this->hidden == NULL) {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	117 SDL_OutOfMemory();
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	118 return 0;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	119 }
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2049 diff changeset	120 SDL_memset(this->hidden, 0, sizeof(*this->hidden));
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	121
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	122 /* Open the audio device */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	123 this->hidden->output = SDL_RWFromFile(fname, "wb");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	124 if (this->hidden->output == NULL) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	125 DISKAUD_CloseDevice(this);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	126 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	127 }
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	128
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	129 /* Allocate mixing buffer */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	130 this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	131 if (this->hidden->mixbuf == NULL) {
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	132 DISKAUD_CloseDevice(this);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	133 return 0;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	134 }
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	135 SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	136
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	137 this->hidden->mixlen = this->spec.size;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	138 this->hidden->write_delay =
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	139 (envr) ? SDL_atoi(envr) : DISKDEFAULT_WRITEDELAY;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	140
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	141 #if HAVE_STDIO_H
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	142 fprintf(stderr,
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	143 "WARNING: You are using the SDL disk writer audio driver!\n"
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	144 " Writing to file [%s].\n", fname);
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	145 #endif
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	146
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	147 /* We're ready to rock and roll. :-) */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	148 return 1;
68 ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	149 }
ac6645260d31 Added an audio driver that writes to disk (thanks Ryan!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	150
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	151 static int
2060 866052b01ee5 indent is evil Sam Lantinga <slouken@libsdl.org> parents: 2049 diff changeset	152 DISKAUD_Init(SDL_AudioDriverImpl * impl)
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	153 {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	154 /* Set the function pointers */
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	155 impl->OpenDevice = DISKAUD_OpenDevice;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	156 impl->WaitDevice = DISKAUD_WaitDevice;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	157 impl->PlayDevice = DISKAUD_PlayDevice;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	158 impl->GetDeviceBuf = DISKAUD_GetDeviceBuf;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	159 impl->CloseDevice = DISKAUD_CloseDevice;
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	160
3699 4160ba33b597 Removed test for "driver is valid, but doesn't see any audio devices." Ryan C. Gordon <icculus@icculus.org> parents: 3697 diff changeset	161 return 1; /* this audio target is available. */
2049 5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	162 }
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	163
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	164 AudioBootStrap DISKAUD_bootstrap = {
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	165 DISKAUD_DRIVER_NAME, "direct-to-disk audio", DISKAUD_Init, 1
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	166 };
5f6550e5184f Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk. Ryan C. Gordon <icculus@icculus.org> parents: 1895 diff changeset	167
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1594 diff changeset	168 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/audio/disk/SDL_diskaudio.c @ 5082:de59e0218aa2