view src/video/aalib/SDL_aavideo.h @ 1138:fcfb783a3ca2

Commercial-OSS-on-Solaris patch... --ryan. Date: Sun, 14 Aug 2005 23:06:40 -0500 From: Shawn Walker <binarycrusader@gmail.com> To: sdl@libsdl.org Subject: [SDL] [PATCH] Audio Detection Bug When using the OSS commercial drivers under Solaris 10, SDL will not properly initialise OSS audio support (dsp) if /dev/sound exists. Under Solaris (as far as I understand) /dev/sound is provided as a means of accessing a BSD style audio device, not the OSS device. SDL assumes that if /dev/sound exists, then it must be running on a Linux 2.4 system and should make the dsp device path /dev/sound/dsp. This is wrong. When using the OSS commercial drivers under Solaris, the dsp device is always referenced as /dev/dsp normally. My proposed fix is to stat the dsp device in /dev/sound to make sure it exists, before assuming /dev/sound/dsp as the audio device: http://icculus.org/~eviltypeguy/SDL_audiodev.patch I'm sure there may be a better way to do it, but the above patch is what worked for me. --=20 Shawn Walker, Software and Systems Analyst binarycrusader@gmail.com - http://binarycrusader.blogspot.com/
author Ryan C. Gordon <icculus@icculus.org>
date Thu, 08 Sep 2005 07:15:44 +0000
parents b8d311d90021
children c9b51268668f
line wrap: on
line source

/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

    Sam Lantinga
    slouken@libsdl.org
*/

#ifdef SAVE_RCSID
static char rcsid =
 "@(#) $Id$";
#endif

#ifndef _SDL_aavideo_h
#define _SDL_aavideo_h

#include "SDL_mouse.h"
#include "SDL_sysvideo.h"
#include "SDL_mutex.h"

#include <aalib.h>

/* Hidden "this" pointer for the video functions */
#define _THIS	SDL_VideoDevice *this

#define SDL_NUMMODES 6

/* Private display data */
struct SDL_PrivateVideoData {
	SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
	aa_context *context;
	aa_palette palette;
	aa_renderparams *rparams;
	double x_ratio, y_ratio;
    int w, h;
    SDL_mutex *mutex;
    int in_x11;
    void *buffer;
};

/* Old variable names */
#define SDL_modelist		(this->hidden->SDL_modelist)
#define AA_context		    (this->hidden->context)
#define AA_palette		    (this->hidden->palette)
#define AA_rparams		    (this->hidden->rparams)
#define AA_buffer		    (this->hidden->buffer)

#define AA_x_ratio		    (this->hidden->x_ratio)
#define AA_y_ratio		    (this->hidden->y_ratio)

#define AA_mutex		    (this->hidden->mutex)
#define AA_in_x11		    (this->hidden->in_x11)
#define AA_w                (this->hidden->w)
#define AA_h                (this->hidden->h)

#endif /* _SDL_aavideo_h */