[FFmpeg-cvslog] r23568 - in trunk: configure doc/general.texi libavdevice/Makefile libavdevice/alldevices.c libavdevice/beosaudio.cpp

[diego]

Author: diego
Date: Thu Jun 10 19:23:45 2010
New Revision: 23568

Log:
Remove broken BeOS audio interface.

Deleted:
   trunk/libavdevice/beosaudio.cpp
Modified:
   trunk/configure
   trunk/doc/general.texi
   trunk/libavdevice/Makefile
   trunk/libavdevice/alldevices.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Jun 10 19:20:05 2010	(r23567)
+++ trunk/configure	Thu Jun 10 19:23:45 2010	(r23568)
@@ -1387,10 +1387,6 @@ alsa_indev_deps="alsa_asoundlib_h snd_pc
 alsa_indev_extralibs="-lasound"
 alsa_outdev_deps="alsa_asoundlib_h"
 alsa_outdev_extralibs="-lasound"
-audio_beos_indev_deps="audio_beos"
-audio_beos_indev_extralibs="-lmedia -lbe"
-audio_beos_outdev_deps="audio_beos"
-audio_beos_outdev_extralibs="-lmedia -lbe"
 bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 dv1394_indev_deps="dv1394 dv_demuxer"
 jack_indev_deps="jack_jack_h"
@@ -2127,7 +2123,6 @@ enabled spic && enable pic
 case $target_os in
     haiku)
         prefix_default="/boot/common"
-        disable audio_beos
         network_extralibs="-lnetwork"
         ;;
     sunos)

Modified: trunk/doc/general.texi
==============================================================================
--- trunk/doc/general.texi	Thu Jun 10 19:20:05 2010	(r23567)
+++ trunk/doc/general.texi	Thu Jun 10 19:23:45 2010	(r23568)
@@ -708,7 +708,6 @@ performance on systems without hardware 
 @multitable @columnfractions .4 .1 .1
 @item Name              @tab Input  @tab Output
 @item ALSA              @tab X      @tab X
- at item BEOS audio        @tab X      @tab X
 @item BKTR              @tab X      @tab
 @item DV1394            @tab X      @tab
 @item JACK              @tab X      @tab

Modified: trunk/libavdevice/Makefile
==============================================================================
--- trunk/libavdevice/Makefile	Thu Jun 10 19:20:05 2010	(r23567)
+++ trunk/libavdevice/Makefile	Thu Jun 10 19:23:45 2010	(r23568)
@@ -25,9 +25,6 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV)    
 # external libraries
 OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
 
-OBJS-$(CONFIG_AUDIO_BEOS_INDEV)          += beosaudio.o
-OBJS-$(CONFIG_AUDIO_BEOS_OUTDEV)         += beosaudio.o
-
 SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
 
 include $(SUBDIR)../subdir.mak

Modified: trunk/libavdevice/alldevices.c
==============================================================================
--- trunk/libavdevice/alldevices.c	Thu Jun 10 19:20:05 2010	(r23567)
+++ trunk/libavdevice/alldevices.c	Thu Jun 10 19:23:45 2010	(r23568)
@@ -40,7 +40,6 @@ void avdevice_register_all(void)
 
     /* devices */
     REGISTER_INOUTDEV (ALSA, alsa);
-    REGISTER_INOUTDEV (AUDIO_BEOS, audio_beos);
     REGISTER_INDEV    (BKTR, bktr);
     REGISTER_INDEV    (DV1394, dv1394);
     REGISTER_INDEV    (JACK, jack);