Ticket #21: oss.diff

File oss.diff, 3.0 KB (added by leland_lucius, 2 years ago)
  • audacity/lib-src/portaudio-v19/include/pa_unix_oss.h

    diff -wruN orig/audacity/lib-src/portaudio-v19/include/pa_unix_oss.h audacity/lib-src/portaudio-v19/include/pa_unix_oss.h
    old new  
     1#ifndef PA_UNIX_OSS_H 
     2#define PA_UNIX_OSS_H 
     3 
     4/* 
     5 * $Id: pa_unix_oss.h 1013 2006-05-15 04:01:31Z rossb $ 
     6 * PortAudio Portable Real-Time Audio Library 
     7 * OSS-specific extensions 
     8 * 
     9 * Copyright (c) 1999-2000 Ross Bencina and Phil Burk 
     10 * 
     11 * Permission is hereby granted, free of charge, to any person obtaining 
     12 * a copy of this software and associated documentation files 
     13 * (the "Software"), to deal in the Software without restriction, 
     14 * including without limitation the rights to use, copy, modify, merge, 
     15 * publish, distribute, sublicense, and/or sell copies of the Software, 
     16 * and to permit persons to whom the Software is furnished to do so, 
     17 * subject to the following conditions: 
     18 * 
     19 * The above copyright notice and this permission notice shall be 
     20 * included in all copies or substantial portions of the Software. 
     21 * 
     22 * Any person wishing to distribute modifications to the Software is 
     23 * requested to send the modifications to the original developer so that 
     24 * they can be incorporated into the canonical version. 
     25 * 
     26 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
     27 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
     28 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
     29 * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
     30 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
     31 * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
     32 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
     33 * 
     34 */ 
     35 
     36/** @file 
     37 * OSS-specific PortAudio API extension header file. 
     38 */ 
     39 
     40#ifdef __cplusplus 
     41extern "C" { 
     42#endif 
     43 
     44const char *PaOSS_GetStreamInputDevice( PaStream *s ); 
     45 
     46const char *PaOSS_GetStreamOutputDevice( PaStream *s ); 
     47 
     48#ifdef __cplusplus 
     49} 
     50#endif 
     51 
     52#endif 
  • audacity/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c

    diff -wruN orig/audacity/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c audacity/lib-src/portaudio-v19/src/hostapi/oss/pa_unix_oss.c
    old new  
    19331933    return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback ); 
    19341934} 
    19351935 
     1936const char *PaOSS_GetStreamInputDevice( PaStream* s ) 
     1937{ 
     1938    PaOssStream *stream = (PaOssStream*)s; 
     1939 
     1940    if( stream->capture ) 
     1941    { 
     1942      return stream->capture->devName; 
     1943    } 
     1944 
     1945   return NULL; 
     1946} 
     1947 
     1948const char *PaOSS_GetStreamOutputDevice( PaStream* s ) 
     1949{ 
     1950    PaOssStream *stream = (PaOssStream*)s; 
     1951 
     1952    if( stream->playback ) 
     1953    { 
     1954      return stream->playback->devName; 
     1955    } 
     1956 
     1957   return NULL; 
     1958}