Remove support for Irix, which is discontinued and does not provide a c++17 complaint compiler.r14.1.x

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ad9ea3eca03ac1ca9f05d616ea39867404d1929f)

25 files changed, 39 insertions, 972 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 4baa071d..d185d3b5 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -47,8 +47,6 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD|FreeBSD|DragonFly|NetBSD" )
   set( OS_BSD 1 )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
   set( OS_SunOS 1 )
-elseif( ${CMAKE_SYSTEM_NAME} MATCHES "IRIX" )
-  set( OS_IRIX 1 )
 else( )
   message( WARNING "Unknown system type!" )
 endif( )
diff --git a/config.h.cmake b/config.h.cmake
index 38d4d633..9fcb93a7 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -3,7 +3,6 @@
 #cmakedefine OS_Linux 1
 #cmakedefine OS_BSD 1
 #cmakedefine OS_SunOS 1
-#cmakedefine OS_IRIX 1
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/doc/kmix/index.docbook b/doc/kmix/index.docbook
index 5cf37c78..3596e3a9 100644
--- a/doc/kmix/index.docbook
+++ b/doc/kmix/index.docbook
@@ -89,7 +89,6 @@ soundcards.</para>
 <listitem><para> All Open Sound System platforms. Explicitly tested
 are &Linux;, FreeBSD, NetBSD and BSDI.</para></listitem>
 <listitem><para> &Solaris; based machines.</para></listitem>
-<listitem><para> &IRIX; based machines.</para></listitem>
 </itemizedlist>
 
 <para>If you have both ALSA and Open Sound System drivers installed, &kmix; will use the ALSA driver.</para>
@@ -475,7 +474,6 @@ Fixes</para></listitem>
 <listitem><para> All Open Sound System platforms. Explicitly tested
 are &Linux;, FreeBSD, NetBSD and BSDI.</para></listitem>
 <listitem><para> &Solaris; based machines.</para></listitem>
-<listitem><para> &IRIX; based machines.</para></listitem>
 <listitem><para> The ALSA soundcard driver.</para></listitem>
 </itemizedlist>
 
diff --git a/doc/kscd/index.docbook b/doc/kscd/index.docbook
index 7efdb02b..5739e10a 100644
--- a/doc/kscd/index.docbook
+++ b/doc/kscd/index.docbook
@@ -124,8 +124,6 @@ script provided in order to facilitate transition for users of workman.</para>
 <listitem><para>Sun</para></listitem>
 <listitem><para>&Solaris; (including <acronym>cdda</acronym>
 support)</para></listitem>
-<listitem><para>&SGI; Irix (including <abbrev>cdda</abbrev>
-support)</para></listitem>
 <listitem><para>Sony NEWS</para></listitem>
 <listitem><para>Ultrix</para></listitem>
 </itemizedlist>
diff --git a/kmix/TODO b/kmix/TODO
index c48ea54c..c03dbbdc 100644
--- a/kmix/TODO
+++ b/kmix/TODO
@@ -35,10 +35,6 @@ OK
 Pending
 
 
-14.6.2004 Christian Esken
-I believe Mixer_IRIX is broken.
-This is due to the old "writeVolumeToHW" and "readVolumeFromHW" interface.
-
 14 december 2002 - Helio Chissini de Castro
 - Figure out devices like SBLive with external Live Drives and their multiple in/outs. As a sample, using headphone output from live drive, mute switch not work as they must, but we need mutting the headphone lfe and center channel to really mute headphone output.
 
diff --git a/kmix/kmix-platforms.cpp b/kmix/kmix-platforms.cpp
index 5545f7be..94bc2d45 100644
--- a/kmix/kmix-platforms.cpp
+++ b/kmix/kmix-platforms.cpp
@@ -35,11 +35,6 @@
 #define SUN_MIXER
 #endif
 
-#ifdef sgi
-#include <sys/fcntl.h>
-#define IRIX_MIXER
-#endif
-
 #ifdef __linux__
 
 #ifdef HAVE_LIBASOUND2
@@ -62,10 +57,6 @@
 #include "mixer_sun.cpp"
 #endif
 
-#if defined(IRIX_MIXER)
-#include "mixer_irix.cpp"
-#endif
-
 // Alsa API's 
 #if defined(ALSA_MIXER)
 #include "mixer_alsa9.cpp"
@@ -117,10 +108,6 @@ MixerFactory g_mixerFactories[] = {
     { SUN_getMixer, SUN_getDriverName, NULL },
 #endif
 
-#if defined(IRIX_MIXER)
-    { IRIX_getMixer, IRIX_getDriverName, NULL },
-#endif
-
 #if defined(ALSA_MIXER)
     { ALSA_getMixer, ALSA_getDriverName, ALSA_getDevIterator },
 #endif
diff --git a/kmix/mixer_backend.h b/kmix/mixer_backend.h
index d2725eb5..62dcf086 100644
--- a/kmix/mixer_backend.h
+++ b/kmix/mixer_backend.h
@@ -85,7 +85,7 @@ protected:
 
 
   int m_devnum;
-  /// User friendly name of the Mixer (e.g. "IRIX Audio Mixer"). If your mixer API
+  /// User friendly name of the Mixer (e.g. "Audio Mixer"). If your mixer API
   /// gives you a usable name, use that name.
   TQString m_mixerName;
   // All mix devices of this phyisical device.
diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp
deleted file mode 100644
index 728f2b41..00000000
--- a/kmix/mixer_irix.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *              KMix -- KDE's full featured mini mixer
- *
- *
- *              Copyright (C) 1996-2000 Christian Esken
- *                        esken@kde.org
- *
- * This program 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 program 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 program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include "mixer_irix.h"
-
-Mixer_Backend* IRIX_getMixer(int devnum)
-{
-  Mixer_Backend *l_mixer;
-  l_mixer = new Mixer_IRIX( devnum);
-  l_mixer->init(devnum);
-  return l_mixer;
-}
-
-
-
-Mixer_IRIX::Mixer_IRIX(int devnum) : Mixer_Backend(devnum)
-{
-  close();
-}
-
-int Mixer_IRIX::open()
-{
-  // Create config
-  m_config = ALnewconfig();
-  if (m_config == (ALconfig)0) {
-    cerr << "OpenAudioDevice(): ALnewconfig() failed\n";
-    return Mixer::ERR_OPEN;
-  }
-  // Open audio device
-  m_port = ALopenport("XVDOPlayer", "w", m_config);
-  if (m_port == (ALport)0) {
-    return Mixer::ERR_OPEN;
-  }
-  else {
-    // Mixer is open. Now define properties
-    devmask	= 1+128+2048;
-    recmask	= 128;
-    i_recsrc    = 128;
-    stereodevs	= 1+128+2048;
-    MaxVolume	= 255;
-
-    i_s_mixer_name = "IRIX Audio Mixer";
-
-    isOpen	= true;
-    return 0;
-  }
-}
-
-int Mixer_IRIX::close()
-{
-  m_isOpen = false;
-  ALfreeconfig(m_config);
-  ALcloseport(m_port);
-  m_mixDevices.clear();
-  return 0;
-}
-
-int Mixer_IRIX::readVolumeFromHW( int devnum, int *VolLeft, int *VolRight )
-{
-  long in_buf[4];
-  switch( devnum() ) {
-  case 0:       // Speaker Output
-    in_buf[0] = AL_RIGHT_SPEAKER_GAIN;
-    in_buf[2] = AL_LEFT_SPEAKER_GAIN;
-    break;
-  case 7:       // Microphone Input (actually selectable).
-    in_buf[0] = AL_RIGHT_INPUT_ATTEN;
-    in_buf[2] = AL_LEFT_INPUT_ATTEN;
-    break;
-  case 11:      // Record monitor
-    in_buf[0] = AL_RIGHT_MONITOR_ATTEN;
-    in_buf[2] = AL_LEFT_MONITOR_ATTEN;
-    break;
-  default:
-    printf("Unknown device %d\n", MixPtr->num() );
-  }
-  ALgetparams(AL_DEFAULT_DEVICE, in_buf, 4);
-  *VolRight = in_buf[1]*100/255;
-  *VolLeft  = in_buf[3]*100/255;
-
-  return 0;
-}
-
-int Mixer_IRIX::writeVolumeToHW( int devnum, int volLeft, int volRight )
-{
-  // Set volume (right&left)
-  long out_buf[4] =
-  {
-    0, volRight,
-    0, volLeft
-  };
-  switch( mixdevice->num() ) {
-  case 0:      // Speaker
-    out_buf[0] = AL_RIGHT_SPEAKER_GAIN;
-    out_buf[2] = AL_LEFT_SPEAKER_GAIN;
-    break;
-  case 7:      // Microphone (Input)
-    out_buf[0] = AL_RIGHT_INPUT_ATTEN;
-    out_buf[2] = AL_LEFT_INPUT_ATTEN;
-    break;
-  case 11:     // Record monitor
-    out_buf[0] = AL_RIGHT_MONITOR_ATTEN;
-    out_buf[2] = AL_LEFT_MONITOR_ATTEN;
-    break;
-  }
-  ALsetparams(AL_DEFAULT_DEVICE, out_buf, 4);
-
-  return 0;
-}
-
-TQString IRIX_getDriverName() {
-        return "IRIX";
-}
-
diff --git a/kmix/mixer_irix.h b/kmix/mixer_irix.h
deleted file mode 100644
index decf143c..00000000
--- a/kmix/mixer_irix.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef MIXER_IRIX_H
-#define MIXER_IRIX_H
-
-#define _LANGUAGE_C_PLUS_PLUS
-#include <dmedia/audio.h>
-
-#include "mixer_backend.h"
-
-class Mixer_IRIX : public Mixer_Backend
-{
-public:
-  Mixer_IRIX(int devnum);
-  virtual ~Mixer_IRIX();
-
-  virtual void setRecsrc(unsigned int newRecsrc);
-  virtual int readVolumeFromHW( int devnum, int *VolLeft, int *VolRight );
-  virtual int writeVolumeToHW( int devnum, int volLeft, int volRight );
-
-protected:
-  virtual void setDevNumName_I(int devnum);
-  virtual int open();
-  virtual int close();
-
-  ALport	m_port;
-  ALconfig	m_config;
-};
-
-#endif
diff --git a/kscd/ConfigureChecks.cmake b/kscd/ConfigureChecks.cmake
index 8047bed7..2abf5db1 100644
--- a/kscd/ConfigureChecks.cmake
+++ b/kscd/ConfigureChecks.cmake
@@ -9,32 +9,6 @@
 #
 #################################################
 
-if( "${CMAKE_SYSTEM_NAME}" MATCHES "IRIX" )
-  # IRIX cdaudio
-  if( NOT CDAUDIO )
-    message( STATUS "Checking for cdaudio library" )
-    find_library( CDAUDIO cdaudio )
-    if( CDAUDIO )
-      message( STATUS "Checking for cdaudio library - found" )
-      set( CDAUDIO_LIBRARIES "cdaudio;mediad;ds" )
-    else( )
-      message( STATUS "Checking for cdaudio library - not found" )
-    endif( )
-  endif( NOT CDAUDIO )
-
-  # Irix CDDA
-  if( NOT FPE )
-    message( STATUS "Checking for fpe library" )
-    find_library( FPE fpe )
-    if( FPE )
-      message( STATUS "Checking for fpe library - found" )
-      set( FPE_LIBRARIES "fpe" )
-    else( )
-      message( STATUS "Checking for fpe library - not found" )
-    endif( )
-  endif( NOT FPE )
-endif( "${CMAKE_SYSTEM_NAME}" MATCHES "IRIX" )
-
 # FreeBSD
 if( "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD" )
   if( NOT CDROM )
diff --git a/kscd/Makefile.am b/kscd/Makefile.am
index 82f205a4..f7e8e180 100644
--- a/kscd/Makefile.am
+++ b/kscd/Makefile.am
@@ -61,7 +61,6 @@ messages: rc.cpp
 cdrom.c:config.h
 plat_bsd386.c:config.h
 plat_freebsd.c:config.h
-plat_irix.c:config.h
 plat_linux.c:config.h
 plat_news.c:config.h
 plat_scor5.c:config.h
diff --git a/kscd/kscd-script b/kscd/kscd-script
index 18803ee2..30064a1c 100755
--- a/kscd/kscd-script
+++ b/kscd/kscd-script
@@ -48,7 +48,6 @@ echo     "               Linux ...................... L"
 echo     "               FreeBSD/NetBSD ............. F"
 echo     "               BSD386 ..................... B"
 echo     "               Sun ........................ S"
-echo     "               Irix ....................... I"
 echo     "               Sony NEWS .................. N"
 echo     "               Ultrix ..................... U"
 echo     "               Generic SVR4 (not Sun) ..... V"
@@ -202,45 +201,6 @@ echo "#endif /* linux */" >> $config_file
 
 }
 
-irix_conf(){
-
-clear
-echo "KSCD configuration for Irix"
-echo "---------------------------"
-echo
-
-give_instructions
-write_config_header
-
-echo "" >> $config_file
-echo "#if defined(sgi)" >> $config_file
-echo "" >> $config_file
-
-echo $ac_n "Please specify your cdrom device [/dev/scsi/sc0d6l0]:$ac_c"
-
-read device
-if [ "$device" = "" ]
-then
-    device="/dev/scsi/sc0d6l0"
-fi
-
-echo "Your choice was: $device"
-echo "#define DEFAULT_CD_DEVICE   \"$device\"  " >> $config_file
-
-echo $ac_n "Enable CDDA? (y/n) [y]:$ac_c"
-
-read curved
-
-case "$curved" in
-    "yes" | "y" | "Yes" | "Y" | "") echo "#define CDDA " >> $config_file ;;
-esac
-echo ""
-echo "That's all for sgi ..."
-
-echo "#endif /* sgi */" >> $config_file
-
-}
-
 bsd386_conf(){
 
 clear
@@ -684,7 +644,6 @@ l|L) linux_conf;;
 f|F) freebsd_netbsd_conf;;
 b|B) bsd386_conf;;
 s|S) sun_conf;;
-i|I) irix_conf;;
 n|N) sony_conf;;
 u|U) ultrix_conf;;
 v|V) generic_svr_conf;;
diff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt
index 08b35ebf..b4bab78d 100644
--- a/kscd/libwm/CMakeLists.txt
+++ b/kscd/libwm/CMakeLists.txt
@@ -27,7 +27,7 @@ tde_add_library( workman STATIC_PIC
   SOURCES
     cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c
     database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c
-    plat_aix.c plat_bsd386.c plat_freebsd.c plat_irix.c
+    plat_aix.c plat_bsd386.c plat_freebsd.c
     plat_linux.c plat_netbsd.c plat_svr4.c plat_ultrix.c plat_news.c
     plat_openbsd.c plat_sun.c plat_scor5.c
     drv_sony.c drv_toshiba.c
diff --git a/kscd/libwm/Makefile.am b/kscd/libwm/Makefile.am
index c5269d7c..c82f2967 100644
--- a/kscd/libwm/Makefile.am
+++ b/kscd/libwm/Makefile.am
@@ -14,7 +14,7 @@ libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
 
 libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
 database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\
-plat_aix.c plat_bsd386.c plat_freebsd.c plat_irix.c \
+plat_aix.c plat_bsd386.c plat_freebsd.c \
 plat_linux.c plat_svr4.c plat_ultrix.c plat_news.c plat_openbsd.c \
 plat_sun.c plat_scor5.c \
 drv_sony.c drv_toshiba.c
diff --git a/kscd/libwm/PLAT_IMPL_STATUS b/kscd/libwm/PLAT_IMPL_STATUS
index 52719d3d..c1ff0b0d 100644
--- a/kscd/libwm/PLAT_IMPL_STATUS
+++ b/kscd/libwm/PLAT_IMPL_STATUS
@@ -8,41 +8,41 @@ X   function available
 \   function dummy, null implementation or commented out
 (X) function available in special configurations
 
-function                |aix  |bsd386|freebsd|irix |linux|news |openbsd|sun  |svr4 |ultrix|
-------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+
-find_cdrom()            |  -  |  -   |   -   |  -  |  -  |  -  |   -   |  X  |  X  |  X   |
-gen_init()              |  \  |  \   |   \   | (X) |  \  |  \  |   \   |  \  |  \  |  \   |
-wmcd_open()             |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-wmcd_close()            |  -  |  -   |   -   |  -  |  -  |  X  |   -   |  -  |  -  |  -   |
-wmcd_reopen()           |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-wm_scsi()               |  \  |  \   |   \   |  \  |  X  |  \  |   \   |  \  |  X  |  \   |
-keep_cd_open()          |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-gen_get_drive_status()  |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+
-gen_get_trackcount()    |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_get_trackinfo()     |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_get_cdlen()         |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+
-gen_play()              |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_pause()             |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_resume()            |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_stop()              |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_eject()             |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_closetray()         |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+
-scale_volume()          |  X  |  X   |   X   |  -  |  X  |  -  |   X   |  X  |  -  |  X   |
-unscale_volume()        |  X  |  X   |   X   |  -  |  -  |  -  |   X   |  X  |  -  |  X   |
-gen_set_volume()        |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-gen_get_volume()        |  X  |  X   |   X   |  X  |  X  |  X  |   X   |  X  |  X  |  X   |
-------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+
-cdda_init()             |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-get_ack()               |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-cdda_kill()             |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-gen_set_direction()     |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-gen_set_speed()         |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-gen_set_loudness()      |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-gen_save()              |  -  |  -   |   -   |  -  |  \  |  -  |   -   |  -  |  -  |  -   |
-------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+
+function                |aix  |bsd386|freebsd|linux|news |openbsd|sun  |svr4 |ultrix|
+------------------------+-----+------+-------+-----+-----+-------+-----+-----+------+
+find_cdrom()            |  -  |  -   |   -   |  -  |  -  |   -   |  X  |  X  |  X   |
+gen_init()              |  \  |  \   |   \   |  \  |  \  |   \   |  \  |  \  |  \   |
+wmcd_open()             |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+wmcd_close()            |  -  |  -   |   -   |  -  |  X  |   -   |  -  |  -  |  -   |
+wmcd_reopen()           |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+wm_scsi()               |  \  |  \   |   \   |  X  |  \  |   \   |  \  |  X  |  \   |
+keep_cd_open()          |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+gen_get_drive_status()  |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+------------------------+-----+------+-------+-----+-----+-------+-----+-----+------+
+gen_get_trackcount()    |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_get_trackinfo()     |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_get_cdlen()         |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+------------------------+-----+------+-------+-----+-----+-------+-----+-----+------+
+gen_play()              |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_pause()             |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_resume()            |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_stop()              |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_eject()             |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_closetray()         |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+------------------------+-----+------+-------+-----+-----+-------+-----+-----+------+
+scale_volume()          |  X  |  X   |   X   |  X  |  -  |   X   |  X  |  -  |  X   |
+unscale_volume()        |  X  |  X   |   X   |  -  |  -  |   X   |  X  |  -  |  X   |
+gen_set_volume()        |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+gen_get_volume()        |  X  |  X   |   X   |  X  |  X  |   X   |  X  |  X  |  X   |
+------------------------+-----+------+-------+-----+-----+-------+-----+-----+------+
+cdda_init()             |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+get_ack()               |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+cdda_kill()             |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+gen_set_direction()     |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+gen_set_speed()         |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+gen_set_loudness()      |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+gen_save()              |  -  |  -   |   -   |  \  |  -  |   -   |  -  |  -  |  -   |
+------------------------+-----+------+-------+-----+-----+-------+-----+-----+------+
 
 
 
diff --git a/kscd/libwm/include/wm_config.h b/kscd/libwm/include/wm_config.h
index 27bb970c..6eaadca9 100644
--- a/kscd/libwm/include/wm_config.h
+++ b/kscd/libwm/include/wm_config.h
@@ -40,7 +40,6 @@
  *********************
  * BSD386
  * FreeBSD
- * Irix (SGI)
  * Linux
  * News  (Sony NewsOS)
  * OpenBSD
@@ -177,21 +176,6 @@
 #endif /* OpenBSD */
 
 /******************************************************************
- * Irix
- ******************************************************************
- ***      **     ***      **  **  *********************************
- *****  ****  **  ****  *****    **********************************
- *****  ****     *****  ******  ***********************************
- *****  ****  **  ****  *****    **********************************
- ***      **  **  **      **  **  *********************************
- ******************************************************************/
-#if defined(sgi) || defined(__sgi)
-
-#define DEFAULT_CD_DEVICE	"/dev/scsi/sc0d6l0"
-
-#endif /* sgi IRIX */
-
-/******************************************************************
  * Linux
  ******************************************************************
  ***  ******      **   ***  **  **  **  **  ***********************
diff --git a/kscd/libwm/plat_irix.c b/kscd/libwm/plat_irix.c
deleted file mode 100644
index 7ed89113..00000000
--- a/kscd/libwm/plat_irix.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * $Id$
- *
- * This file is part of WorkMan, the civilized CD player library
- * (c) 1991-1997 by Steven Grimm (original author)
- * (c) by Dirk Försterling (current 'author' = maintainer)
- * The maintainer can be contacted by his e-mail address:
- * milliByte@DeathsDoor.com 
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *
- * IRIX specific.
- *
- * Taken from the kscd distribution
- *
- * Paul Kendall
- * paul@orion.co.nz, or
- * paul@kcbbs.gen.nz
- */
-
-#if defined(sgi) || defined(__sgi)
- 
-#include "include/wm_config.h"
-
-/*
- * Yes, it was designed for WorkMan 1.4b3
- * Because I did start over from 1.3a, I disable it here.
- * There is no guarantee of getting working code by defining
- * CDDA yourself.
- *
- */
-#undef CDDA
-/*#define CDDA*/
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sigfpe.h>
-#include <dmedia/cdaudio.h>
-#include <dmedia/audio.h>
-#include <errno.h>
-
-#include "include/wm_struct.h"
-#include "include/wm_cdtext.h"
-
-#define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
-
-void *malloc();
-char *strchr();
-
-int	min_volume = 0;
-int	max_volume = 255;
-
-#ifdef CDDA
-static int playing = STOPPED;
-static CDPLAYER *icd;
-static CDPARSER *icdp;
-static CDFRAME cdbuf[12];
-static ALport audioport;
-static ALconfig aconfig;
-static struct itimerval audiotimer = { {0,0}, {0,25000} };
-static int cdtrack=0;
-static int cdframe=0;
-static int cdstopframe=0;
-
-/*
- * Platform specific internal functions for CDDA
- */
-void
-cbprognum(void *arg, CDDATATYPES type, CDPROGNUM* prognum)
-{
-  cdtrack = prognum->value;
-} /* cbprognum() */
-
-void
-cbabstime(void *arg, CDDATATYPES type, struct cdtimecode* atime)
-{
-  cdframe = CDtctoframe(atime);
-  if( cdframe == cdstopframe )
-    playing = STOPPED;
-} /* cbabstime() */
-
-void
-cbplayaudio(void *arg, CDDATATYPES type, short* audio)
-{
-	if(playing != PLAYING) return;
-	ALwritesamps(audioport, audio, CDDA_NUMSAMPLES);
-} /* cbplayaudio() */
-
-static void 
-alarmsignal()
-{
-  int n, i;
-  if(playing != PLAYING) return;
-  if( ALgetfilled(audioport) < CDDA_NUMSAMPLES*8 ) 
-    {
-      /* Only get more samples and play them if we're getting low
-       * this ensures that the CD stays close to the sound
-       */
-      n = CDreadda(icd, cdbuf, 12);
-      if( n == 0 ) return;
-      for( i=0 ; i<12 ; i++ )
-	CDparseframe(icdp, &cdbuf[i]);
-    }
-  signal(SIGALRM, alarmsignal);
-  setitimer(ITIMER_REAL, &audiotimer, NULL);
-} /* alarmsignal() */
-#endif
-
-/*--------------------------------------------------------*
- * Initialize the drive.  A no-op for the generic driver.
- *--------------------------------------------------------*/
-int
-gen_init( struct wm_drive *d )
-{
-#ifdef CDDA
-  long Param[4];
-  /* Set the audio rate to 44100Hz 16bit 2s-comp stereo */
-  aconfig = ALnewconfig();
-  ALsetwidth(aconfig, AL_SAMPLE_16);
-  ALsetsampfmt(aconfig, AL_SAMPFMT_TWOSCOMP);
-  ALsetchannels(aconfig, 2);
-  Param[0] = AL_OUTPUT_RATE;      Param[1] = AL_RATE_44100;
-  Param[2] = AL_CHANNEL_MODE;     Param[3] = AL_STEREO;
-  ALsetparams(AL_DEFAULT_DEVICE, Param, 4);
-  audioport = ALopenport("KDE KSCD Audio", "w", aconfig);
-  
-  /* setup cdparser */
-  icdp = CDcreateparser();
-  CDaddcallback(icdp, cd_audio, (CDCALLBACKFUNC)cbplayaudio, 0);
-  CDaddcallback(icdp, cd_pnum, (CDCALLBACKFUNC)cbprognum, 0);
-  CDaddcallback(icdp, cd_atime, (CDCALLBACKFUNC)cbabstime, 0);
-  
-  /* Lets handle those floating point exceptions expeditiously. */
-  sigfpe_[_UNDERFL].repls = _ZERO;
-  handle_sigfpes(_ON, _EN_UNDERFL, NULL, _ABORT_ON_ERROR, NULL);
-#endif
-  return 0;
-} /* gen_init() */
-
-/*-------------------------------------------------------------*
- * Open the CD and figure out which kind of drive is attached.
- *-------------------------------------------------------------*/
-int
-wmcd_open( struct wm_drive *d )
-{
-  int	fd;
-  CDSTATUS s;
-  
-  if (d->fd < 0)		/* Device already open? */
-    {
-      if (d->cd_device == NULL)
-        d->cd_device = DEFAULT_CD_DEVICE;
-      
-      d->fd = 1;
-      
-      /* Now fill in the relevant parts of the wm_drive structure. */
-      fd = d->fd;
-      find_drive_struct("", "", "");
-      d->fd = fd;
-      (d->init)(d);
-      
-      d->daux = CDopen(d->cd_device,"r");
-      if (d->daux == 0)
-	{
-          return (-6);
-	}
-#ifdef CDDA
-      icd = d->daux;
-#endif
-    } else {
-      wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): [device is open (fd=%d)]\n", d->fd);
-    }
-  
-  CDgetstatus(d->daux, &s);
-  if( s.state==CD_NODISC || s.state==CD_ERROR )
-    return 1;
-  
-  return (0);
-} /* wmcd_open() */
-
-/*
- * Re-Open the device if it is open.
- */
-int
-wmcd_reopen( struct wm_drive *d )
-{
-  int status;
-  
-  do {
-    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_reopen\n");
-    status = gen_close( d );
-    wm_susleep( 1000 );
-    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "calling wmcd_open()\n");
-    status = wmcd_open( d ); /* open it as usual */
-    wm_susleep( 1000 );
-  } while ( status != 0 );
-  return status;
-} /* wmcd_reopen() */
-
-
-/*----------------------------------*
- * Send a SCSI command out the bus.
- *----------------------------------*/
-int 
-wm_scsi( struct wm_drive *d, unsigned char *xcdb, int cdblen, 
-	 char *retbuf, int retbuflen, int getreply)
-{
-  return -1;
-} /* wm_scsi() */
-
-int
-gen_close( struct wm_drive *d )
-{
-  if(d->fd != -1) {
-    wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "closing the device\n");
-    close(d->fd);
-    d->fd = -1;
-  }
-  return 0;
-}
-
-/*--------------------------------------------------------------------------*
- * Get the current status of the drive: the current play mode, the absolute
- * position from start of disc (in frames), and the current track and index
- * numbers if the CD is playing or paused.
- *--------------------------------------------------------------------------*/
-int
-gen_get_drive_status( struct wm_drive *d, int oldmode,
-                      int *mode, int *pos, int *track,
-                      int *index )
-{
-#ifdef CDDA
-  *mode = playing;
-  *track = cdtrack;
-  *pos = cdframe;
-  *index = 0;
-#else
-  CDSTATUS s;
-  if( CDgetstatus(d->daux, &s)==0 )
-    return -1;
-  *pos = CDmsftoframe(s.min,s.sec,s.frame);
-  *track = s.track;
-  *index = 0;
-  switch( s.state )
-    {
-    case CD_READY:	*mode = WM_CDM_STOPPED;
-      break;
-    case CD_STILL:
-    case CD_PAUSED: *mode = WM_CDM_PAUSED;
-      break;
-    case CD_PLAYING: *mode = WM_CDM_PLAYING;
-      break;
-    default:		*mode = WM_CDM_UNKNOWN;
-    }
-#endif
-  return 0;
-} /* gen_get_drive_status() */
-
-/*-------------------------------------*
- * Get the number of tracks on the CD.
- *-------------------------------------*/
-int
-gen_get_trackcount( struct wm_drive *d, int *tracks )
-{
-  CDSTATUS s;
-  if( CDgetstatus(d->daux, &s)==0 )
-    return -1;
-  *tracks = s.last;
-  return 0;
-} /* gen_get_trackcount() */
-
-/*---------------------------------------------------------*
- * Get the start time and mode (data or audio) of a track.
- *---------------------------------------------------------*/
-int
-gen_get_trackinfo( struct wm_drive *d, int track, int *data, int *startframe)
-{
-  CDTRACKINFO i;
-  int ret = CDgettrackinfo(d->daux, track, &i);
-  if( ret == 0 )
-    return -1;
-  *data = 0;
-  *startframe = CDmsftoframe(i.start_min,i.start_sec,i.start_frame);
-  return 0;
-} /* gen_get_trackinfo() */
-
-/*-------------------------------------*
- * Get the number of frames on the CD.
- *-------------------------------------*/
-int
-gen_get_cdlen( struct wm_drive *d, int *frames )
-{
-  CDSTATUS s;
-  if( CDgetstatus(d->daux, &s)==0 )
-    return -1;
-  *frames = CDmsftoframe(s.total_min,s.total_sec,s.total_frame);
-  return 0;
-} /* gen_get_cdlen() */
-
-/*------------------------------------------------------------*
- * Play the CD from one position to another (both in frames.)
- *------------------------------------------------------------*/
-int
-gen_play( struct wm_drive *d, int start, int end )
-{
-#ifdef CDDA
-  int m, s, f;
-  CDframetomsf(start, &m, &s, &f);
-  CDseek(icd, m, s, f);
-  cdstopframe = end;
-  playing = PLAYING;
-  signal(SIGALRM, alarmsignal);
-  setitimer(ITIMER_REAL, &audiotimer, NULL);
-#else
-  int m, s, f;
-  CDframetomsf(start, &m, &s, &f);
-  CDplayabs(d->daux, m, s, f, 1);
-#endif
-  return 0;
-} /* gen_play() */
-
-/*---------------*
- * Pause the CD.
- *---------------*/
-int
-gen_pause( struct wm_drive *d )
-{
-#ifdef CDDA
-  playing = WM_CDM_PAUSED;
-#else
-  CDSTATUS s;
-  if( CDgetstatus(d->daux, &s)==0 )
-    return -1;
-  if(s.state == CD_PLAYING)
-    CDtogglepause(d->daux);
-#endif
-  return 0;
-} /* gen_pause() */
-
-/*-------------------------------------------------*
- * Resume playing the CD (assuming it was paused.)
- *-------------------------------------------------*/
-int
-gen_resume( struct wm_drive *d )
-{
-#ifdef CDDA
-  playing = WM_CDM_PLAYING;
-  signal(SIGALRM, alarmsignal);
-  setitimer(ITIMER_REAL, &audiotimer, NULL);
-#else
-  CDSTATUS s;
-  if( CDgetstatus(d->daux, &s)==0 )
-    return -1;
-  if(s.state == CD_PAUSED)
-    CDtogglepause(d->daux);
-#endif
-  return 0;
-} /* gen_resume() */
-
-/*--------------*
- * Stop the CD.
- *--------------*/
-int
-gen_stop( struct wm_drive *d )
-{
-#ifdef CDDA
-  playing = WM_CDM_STOPPED;
-#else
-  CDstop(d->daux);
-#endif
-  return 0;
-} /* gen_stop() */
-
-/*----------------------------------------*
- * Eject the current CD, if there is one.
- *----------------------------------------*/
-int
-gen_eject( struct wm_drive *d )
-{
-#ifdef CDDA
-  playing = WM_CDM_STOPPED;
-#endif
-  CDeject(d->daux);
-  return 0;
-} /* gen_eject() */
-
-/*----------------------------------------*
- * Close the CD tray
- *
- * Please edit and send changes to
- * milliByte@Deathsdoor.com
- *----------------------------------------*/
-
-int 
-gen_closetray(struct wm_drive *d)
-{
-#ifdef CAN_CLOSE
-  if(!close(d->fd))
-    {
-      d->fd=-1;
-      return(wmcd_reopen(d));
-    } else {
-      return(-1);
-    }
-#else
-  /* Always succeed if the drive can't close */
-  return(0);
-#endif /* CAN_CLOSE */
-} /* gen_closetray() */
-
-/*---------------------------------------------------------------------*
- * Set the volume level for the left and right channels.  Their values
- * range from 0 to 100.
- *---------------------------------------------------------------------*/
-int
-gen_set_volume( struct wm_drive *d, int left, int right )
-{
-  long Param[4];
-  Param[0] = AL_LEFT_SPEAKER_GAIN;      Param[1] = left*255/100;
-  Param[2] = AL_RIGHT_SPEAKER_GAIN;     Param[3] = right*255/100;
-  ALsetparams(AL_DEFAULT_DEVICE, Param, 4);
-  return 0;
-} /* gen_set_volume() */
-
-/*---------------------------------------------------------------------*
- * Read the initial volume from the drive, if available.  Each channel
- * ranges from 0 to 100, with -1 indicating data not available.
- *---------------------------------------------------------------------*/
-int
-gen_get_volume( struct wm_drive *d, int *left, int *right )
-{
-  long Param[4];
-  Param[0] = AL_LEFT_SPEAKER_GAIN;      Param[1] = 0;
-  Param[2] = AL_RIGHT_SPEAKER_GAIN;     Param[3] = 0;
-  ALgetparams(AL_DEFAULT_DEVICE, Param, 4);
-  *left = Param[1] * 100 / 255;
-  *right = Param[3] * 100 / 255;
-  return 0;
-} /* gen_get_volume() */
-
-
-/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, length)
- *------------------------------------------------------------------------*/
-
-int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
-{
-  return -1; /* no SCSI, no CDTEXT */
-} /* gen_get_cdtext() */
-
-
-#endif
-
diff --git a/mpeglib/configure.in.in b/mpeglib/configure.in.in
index d5ad4fd0..7efb689e 100644
--- a/mpeglib/configure.in.in
+++ b/mpeglib/configure.in.in
@@ -218,11 +218,6 @@ case "$OS_TYPE" in
     AC_DEFINE(OS_SunOS,1,[Define if you have solaris -lpthread]) 
     ;;
 
-  IRIX)
-    AC_MSG_RESULT([IRIX :Unknown hardware. You will have problems!!])
-    AC_DEFINE(OS_IRIX,1,[Define if you have iris])
-    ;;
-
   *)
     AC_MSG_RESULT([Very Unknown hardware. **Better give up!**])
     ;;
diff --git a/mpeglib/lib/input/cdromAccess.cpp b/mpeglib/lib/input/cdromAccess.cpp
index 6e339c58..543c7287 100644
--- a/mpeglib/lib/input/cdromAccess.cpp
+++ b/mpeglib/lib/input/cdromAccess.cpp
@@ -31,10 +31,6 @@
   #include "cdromAccess_Empty.cpp"
 #endif
 
-#if defined(OS_IRIX) || defined(OS_IRIX64)
-  #include "cdromAccess_Empty.cpp"
-#endif
-
 #ifdef OS_SunOS
   #include "cdromAccess_Empty.cpp"
 #endif
diff --git a/mpeglib/lib/util/audio/Makefile.am b/mpeglib/lib/util/audio/Makefile.am
index de74ff1c..59ea74bb 100644
--- a/mpeglib/lib/util/audio/Makefile.am
+++ b/mpeglib/lib/util/audio/Makefile.am
@@ -4,7 +4,7 @@
 INCLUDES                = 	$(all_includes)
 
 EXTRA_DIST		=	audioIO_AIX.cpp audioIO_BeOS.cpp \
-				audioIO_IRIX.cpp audioIO_Linux.cpp \
+				audioIO_Linux.cpp \
 				audioIO_SunOS.cpp audioIO_SDL.cpp
 
 noinst_HEADERS		=	audioIO.h dspWrapper.h
diff --git a/mpeglib/lib/util/audio/audioIO.cpp b/mpeglib/lib/util/audio/audioIO.cpp
index ca445119..f0d2bbec 100644
--- a/mpeglib/lib/util/audio/audioIO.cpp
+++ b/mpeglib/lib/util/audio/audioIO.cpp
@@ -35,10 +35,6 @@
 #endif
 #endif
 
-#if defined(OS_IRIX) || defined(OS_IRIX64)
-  #include "audioIO_IRIX.cpp"
-#endif
-
 #ifdef OS_SunOS
   #include "audioIO_SunOS.cpp"
 #endif
diff --git a/mpeglib/lib/util/audio/audioIO.h b/mpeglib/lib/util/audio/audioIO.h
index 7de04c99..9d2fa623 100644
--- a/mpeglib/lib/util/audio/audioIO.h
+++ b/mpeglib/lib/util/audio/audioIO.h
@@ -35,10 +35,6 @@ extern "C" {
   #define AUSIZ 32768
 #endif
 
-#if defined(OS_IRIX) || defined(OS_IRIX64)
-  #define AUSIZ 32768
-#endif
-
 #ifdef OS_SunOS
   #define AUSIZ 4096
 #endif
diff --git a/mpeglib/lib/util/audio/audioIO_IRIX.cpp b/mpeglib/lib/util/audio/audioIO_IRIX.cpp
deleted file mode 100644
index 8498a487..00000000
--- a/mpeglib/lib/util/audio/audioIO_IRIX.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/* this file is a part of amp software, (C) tomislav uzelac 1996,1997
-
-	Origional code by: Karl Anders Oygard
-	Modified by:
-	* Andrew Richards - moved code from audio.c
-
- */
-#include <assert.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <dmedia/audio.h>
-#include "audioIO.h"
-
-/* declare these static to effectively isolate the audio device */
-
-static ALport audioport;
-static ALconfig audioconfig;
-
-
-/* audioOpen() */
-/* should open the audio device, perform any special initialization		 */
-/* Set the frequency, no of channels and volume. Volume is only set if */
-/* it is not -1 */
-
-
-void audioOpen() {
-  printf("sorry. The audio part for irix must be fixed. \n");
-}
-
-void
-audioInit(int sampleSize,int frequency, int stereo)
-{
-	ALconfig audioconfig;
-	audioconfig = ALnewconfig();
- 
-	if (!audioconfig)
-		die("out of memory\n");
-	else {
-		long pvbuf[] = { AL_OUTPUT_COUNT, 0, AL_MONITOR_CTL, 0, AL_OUTPUT_RATE, 0};
-		
-		if (ALgetparams(AL_DEFAULT_DEVICE, pvbuf, 6) < 0)
-			if (oserror() == AL_BAD_DEVICE_ACCESS)
-				die("couldn't access audio device\n");
-		
-		if (pvbuf[1] == 0 && pvbuf[3] == AL_MONITOR_OFF) {
-			long al_params[] = { AL_OUTPUT_RATE, 0};
-			
-			al_params[1] = frequency;
-			ALsetparams(AL_DEFAULT_DEVICE, al_params, 2);
-		} else
-			if (pvbuf[5] != frequency)
-				die("audio device is already in use with wrong sample output rate\n");
-		
-		/* ALsetsampfmt(audioconfig, AL_SAMPFMT_TWOSCOMP); this is the default */
-		/* ALsetwidth(audioconfig, AL_SAMPLE_16); this is the default */
-		
-		if (!stereo) ALsetchannels(audioconfig, AL_MONO);
-		/* else ALsetchannels(audioconfig, AL_STEREO); this is the default */
-
-		ALsetqueuesize(audioconfig, AUSIZ * 2);
-		
-		audioport = ALopenport("amp", "w", audioconfig);
-		if (audioport == (ALport) 0) {
-			switch (oserror()) {
-			case AL_BAD_NO_PORTS:
-				die("system is out of ports\n");
-				
-			case AL_BAD_DEVICE_ACCESS:
-				die("couldn't access audio device\n");
-				
-			case AL_BAD_OUT_OF_MEM:
-				die("out of memory\n");
-			}			 
-			exit(-1);
-		}
-		ALsetfillpoint(audioport, AUSIZ);
-	}
-}
-
-
-/* audioSetVolume - only code this if your system can change the volume while */
-/*									playing. sets the output volume 0-100 */
-
-void
-audioSetVolume(int volume)
-{
-	long al_params[] = { AL_LEFT_SPEAKER_GAIN, 0, AL_RIGHT_SPEAKER_GAIN, 0};
-
-	al_params[1] = al_params[3] = volume * 100 / 255;
-
-	ALsetparams(AL_DEFAULT_DEVICE, al_params, 4);
-}
-
-
-/* audioFlush() */
-/* should flush the audio device */
-
-void
-audioFlush()
-{
-	DB(audio, msg("audio: flush %d\n",audio_fd) );
-}
-
-
-/* audioClose() */
-/* should close the audio device and perform any special shutdown			 */
-
-void
-audioClose()
-{
-int write_fd;
-
-	/* wait for all samples to be played */
-
-	write_fd = ALgetfd(audioport);
-	if (write_fd >= 0) {
-		fd_set write_fds;
-
-		FD_ZERO(&write_fds);
-		FD_SET(write_fd, &write_fds);
-
-		ALsetfillpoint(audioport, AUSIZ * 2);
-		select(write_fd + 1, NULL, &write_fds, NULL, NULL);
-	}
-
-	/* now close it */
-
-	ALcloseport(audioport);
-	DB(audio, msg("audio: closed %d\n",audio_fd) );
-}
-
-
-/* audioWrite */
-/* writes count bytes from buffer to the audio device */
-/* returns the number of bytes actually written */
-
-int audioWrite(char *buffer, int count)
-{
-	if (ALwritesamps(audioport, buffer, count / 2) == 0) {
-		ALsetfillpoint(audioport, AUSIZ);
-		return(count);
-	} else
-		return 0;
-}
-
-/* Let buffer.c have the audio descriptor so it can select on it. This
-   means that the program is dependent on an file descriptor to
-   work. Should really move the select's etc (with inlines of course) in
-   here so that this is the ONLY file which has hardware dependent audio
-   stuff in it. */
-
-int
-getAudioFd()
-{
-	return ALgetfd(audioport);
-}
-
diff --git a/mpg123_artsplugin/mpg123/audio.c b/mpg123_artsplugin/mpg123/audio.c
index b37c6659..5b752572 100644
--- a/mpg123_artsplugin/mpg123/audio.c
+++ b/mpg123_artsplugin/mpg123/audio.c
@@ -6,12 +6,6 @@ void audio_info_struct_init(struct audio_info_struct *ai)
 #ifdef AUDIO_USES_FD
   ai->fn = -1;
 #endif
-#ifdef SGI
-#if 0
-  ALconfig config;
-  ALport port;
-#endif
-#endif
   ai->rate = -1;
   ai->gain = -1;
   ai->output = -1;
diff --git a/mpg123_artsplugin/mpg123/audio.h b/mpg123_artsplugin/mpg123/audio.h
index 96787df4..578129a3 100644
--- a/mpg123_artsplugin/mpg123/audio.h
+++ b/mpg123_artsplugin/mpg123/audio.h
@@ -35,12 +35,6 @@ enum { DECODE_TEST, DECODE_AUDIO, DECODE_FILE, DECODE_BUFFER, DECODE_WAV,
 #include <UMSAudioDevice.h>
 #endif
 
-#ifdef SGI
-/* #include <audio.h> */
-#include <dmedia/audio.h>
-#endif
-
-
 #ifdef HAVE_ALSA_ASOUNDLIB_H
 #include <alsa/asoundlib.h>
 #elif defined(HAVE_SYS_ASOUNDLIB_H)
@@ -52,10 +46,6 @@ struct audio_info_struct
 #ifdef AUDIO_USES_FD
   int fn; /* filenumber */
 #endif
-#ifdef SGI
-  ALconfig config;
-  ALport port;
-#endif
   long rate;
   long gain;
   int output;