changeset 2745:3ba15b5aeadb

Remove unused cruft.
author William Pitcock <nenolod@atheme.org>
date Mon, 30 Jun 2008 22:37:17 -0500
parents af1338519322
children aa2e0f33f55d
files src/psf2/oss.c src/psf2/oss.h
diffstat 2 files changed, 0 insertions(+), 258 deletions(-) [+]
line wrap: on
line diff
--- a/src/psf2/oss.c	Mon Jun 30 22:36:31 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-/*
-
-	Audio Overload SDK
-
-	Copyright (c) 2007, R. Belmont and Richard Bannister.
-
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-	PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/soundcard.h>
-
-#include "ao.h"
-#include "oss.h"
-
-#define LOG_WAVE 	(0)
-#define VALGRIND 	(0)
-
-#define NUM_FRAGS_BROKEN    (8)
-#define NUM_FRAGS_NORMAL    (4)
-static INT32 num_frags;
-#define OSS_FRAGMENT (0x000D | (num_frags<<16));  // 16k fragments (2 * 2^14).
-
-// local variables
-
-void  (*m1sdr_Callback)(signed short *data, unsigned long dwNumSamples);
-unsigned long cbUserData;
-
-static int hw_present;
-
-static INT32 is_broken_driver;
-int nDSoundSegLen = 44100 / 60;
-int oss_nw = 0;
-
-int audiofd;
-#if LOG_WAVE
-FILE *logfil;
-#endif
-
-static int playtime = 0;
-
-static INT16 samples[44100*2];
-
-
-// set # of samples per update
-void m1sdr_TimeCheck(void)
-{
-#if VALGRIND
-	m1sdr_Update();
-#else
-	audio_buf_info info;
-
-    	ioctl(audiofd, SNDCTL_DSP_GETOSPACE, &info);
-
-	if (oss_nw)
-	{
-		int err;
-
-		psf2_gen(samples, nDSoundSegLen);
-		playtime++;
-
-		// output the generated samples
-		err = write(audiofd, samples, nDSoundSegLen * 4);
-		if (err == -1)
-		{
-			perror("write\n");
-		}
-
-		#if LOG_WAVE
-		fwrite(samples, nDSoundSegLen*4, 1, logfil);
-		#endif
-	}
-	else
-	{
-	    	while (info.bytes >= (nDSoundSegLen * 4))
-		{
-			psf2_gen(samples, nDSoundSegLen);
-			playtime++;
-
-			// output the generated samples
-			write(audiofd, samples, nDSoundSegLen * 4);
-
-			#if LOG_WAVE
-			fwrite(samples, nDSoundSegLen*4, 1, logfil);
-			#endif
-
-		    	ioctl(audiofd, SNDCTL_DSP_GETOSPACE, &info);
-		}
-	}
-
-	usleep(50);
-#endif
-}
-
-// m1sdr_Init - inits the output device and our global state
-
-INT16 m1sdr_Init(int sample_rate)
-{	
-	int format, stereo, rate, fsize;
-
-	hw_present = 0;
-
-	nDSoundSegLen = sample_rate / 60;
-
-	memset(samples, 0, 44100*4);	// zero out samples
-
-	m1sdr_Callback = NULL;
-
-	audiofd = open("/dev/dsp", O_WRONLY, 0);
-	if (audiofd == -1)
-	{
-		perror("/dev/dsp");
-		printf("ERROR: unable to open soundcard.  Aborting.\n");
-		return(0);
-	}
-
-	// reset things
-	ioctl(audiofd, SNDCTL_DSP_RESET, 0);
-
-	is_broken_driver = 0;
-	num_frags = NUM_FRAGS_NORMAL;
-
-	// set the buffer size we want
-	fsize = OSS_FRAGMENT;
-	if (ioctl(audiofd, SNDCTL_DSP_SETFRAGMENT, &fsize) == - 1)
-	{
-	perror("SNDCTL_DSP_SETFRAGMENT");
-	return(0);
-	}
-
-	// set 16-bit output
-	format = AFMT_S16_NE;	// 16 bit signed "native"-endian
-	if (ioctl(audiofd, SNDCTL_DSP_SETFMT, &format) == - 1)
-	{
-			perror("SNDCTL_DSP_SETFMT");
-		return(0);
-	}
-
-	// now set stereo
-	stereo = 1;
-	if (ioctl(audiofd, SNDCTL_DSP_STEREO, &stereo) == - 1)
-	{
-			perror("SNDCTL_DSP_STEREO");
-		return(0);
-	}
-
-	// and the sample rate
-	rate = sample_rate;
-	if (ioctl(audiofd, SNDCTL_DSP_SPEED, &rate) == - 1)
-	{
-			perror("SNDCTL_DSP_SPEED");
-		return(0);
-	}
-
-	// and make sure that did what we wanted
-	ioctl(audiofd, SNDCTL_DSP_GETBLKSIZE, &fsize);
-	//printf("Fragment size: %d\n", fsize);
-
-	hw_present = 1;
-
-#if LOG_WAVE
-	logfil = fopen("log.bin", "wb");
-#endif
-
-	return (1);
-}
-
-void m1sdr_Exit(void)
-{	
-	if (!hw_present) return;
-
-	close(audiofd);
-#if LOG_WAVE
-	fclose(logfil);
-#endif
-}
-
-void m1sdr_SetCallback(void *fn)
-{
-	if (fn == (void *)NULL)
-	{
-		printf("ERROR: NULL CALLBACK!\n");
-	}
-
-//	printf("m1sdr_SetCallback: aok!\n");
-	m1sdr_Callback = (void (*)(unsigned long, signed short *))fn;
-}
-
-INT16 m1sdr_IsThere(void)
-{
-	audiofd = open("/dev/dsp", O_WRONLY, 0);
-
-	if (audiofd == -1)
-	{
-		printf("Error accessing soundcard, sound will be disabled\n");
-		hw_present = 0;
-		return(0);
-	}
-
-	close(audiofd);
-	hw_present = 1;
-	return (1);
-}
-
-INT32 m1sdr_HwPresent(void)
-{
-	return hw_present;
-}
--- a/src/psf2/oss.h	Mon Jun 30 22:36:31 2008 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#ifndef _OSS_H_
-#define _OSS_H_
-
-extern int audiofd;
-extern unsigned long cbUserData;
-
-// function protos
-
-void m1sdr_Update(void);
-INT16 m1sdr_Init(int sample_rate);
-void m1sdr_Exit(void);
-void m1sdr_PlayStart(void);
-void m1sdr_PlayStop(void);
-INT16 m1sdr_IsThere(void);
-void m1sdr_TimeCheck(void);
-void m1sdr_SetSamplesPerTick(UINT32 spf);
-void m1sdr_SetHz(UINT32 hz);
-void m1sdr_SetCallback(void *fn);
-void m1sdr_SetCPUHog(int hog);
-INT32 m1sdr_HwPresent(void);
-void m1sdr_FlushAudio(void);
-void m1sdr_Pause(int); 
-void m1sdr_SetNoWait(int nw);
-short *m1sdr_GetSamples(void);
-int m1sdr_GetPlayTime(void);
-#endif