diff options
28 files changed, 44 insertions, 980 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 6eb68420..4baa071d 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -49,8 +49,6 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) set( OS_SunOS 1 ) elseif( ${CMAKE_SYSTEM_NAME} MATCHES "IRIX" ) set( OS_IRIX 1 ) -elseif( ${CMAKE_SYSTEM_NAME} MATCHES "HPUX" ) - set( OS_HPUX 1 ) else( ) message( WARNING "Unknown system type!" ) endif( ) diff --git a/config.h.cmake b/config.h.cmake index f78d86cf..38d4d633 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -4,7 +4,6 @@ #cmakedefine OS_BSD 1 #cmakedefine OS_SunOS 1 #cmakedefine OS_IRIX 1 -#cmakedefine OS_HPUX 1 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -60,4 +59,4 @@ #cmakedefine ao_new_port @ao_new_port@ /* kmix */ -#cmakedefine WITH_KMIX_EXPERIMENTAL 1
\ No newline at end of file +#cmakedefine WITH_KMIX_EXPERIMENTAL 1 diff --git a/doc/kmix/index.docbook b/doc/kmix/index.docbook index baeb926d..5cf37c78 100644 --- a/doc/kmix/index.docbook +++ b/doc/kmix/index.docbook @@ -90,7 +90,6 @@ soundcards.</para> are &Linux;, FreeBSD, NetBSD and BSDI.</para></listitem> <listitem><para> &Solaris; based machines.</para></listitem> <listitem><para> &IRIX; based machines.</para></listitem> -<listitem><para> &HP-UX; based machines.</para></listitem> </itemizedlist> <para>If you have both ALSA and Open Sound System drivers installed, &kmix; will use the ALSA driver.</para> @@ -478,7 +477,6 @@ 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> -<listitem><para> &HP-UX; based machines.</para></listitem> </itemizedlist> </sect1> diff --git a/doc/kscd/index.docbook b/doc/kscd/index.docbook index d36645af..7efdb02b 100644 --- a/doc/kscd/index.docbook +++ b/doc/kscd/index.docbook @@ -124,7 +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>&HP-UX;</para></listitem> <listitem><para>&SGI; Irix (including <abbrev>cdda</abbrev> support)</para></listitem> <listitem><para>Sony NEWS</para></listitem> diff --git a/kmix/Makefile.am b/kmix/Makefile.am index 6f832824..dab4952c 100644 --- a/kmix/Makefile.am +++ b/kmix/Makefile.am @@ -25,13 +25,13 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel kmixIface.skel \ kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp -kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) $(LIB_TDECORE) -lDCOP +kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) $(LIB_TDECORE) -lDCOP kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \ mixertoolbox.cpp mixer_backend.cpp -kmixctrl_la_LIBADD = $(LIB_TDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) -lDCOP +kmixctrl_la_LIBADD = $(LIB_TDECORE) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_TQT) -lDCOP kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version kmix_panelapplet_la_SOURCES = kmixapplet.cpp \ @@ -42,7 +42,7 @@ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \ kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kmix_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +kmix_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBOSSAUDIO) $(LIBASOUND) xdg_apps_DATA = kmix.desktop diff --git a/kmix/kmix-platforms.cpp b/kmix/kmix-platforms.cpp index b27a9ed7..5545f7be 100644 --- a/kmix/kmix-platforms.cpp +++ b/kmix/kmix-platforms.cpp @@ -53,14 +53,6 @@ #define OSS_MIXER #endif -#if defined(hpux) -# if defined(HAVE_ALIB_H) -# define HPUX_MIXER -# else -# warning ** YOU NEED to have libAlib installed to use the HP-UX-Mixer ** -# endif // HAVE_ALIB_H -#endif // hpux - // PORTING: add #ifdef PLATFORM , commands , #endif, add your new mixer below #if defined(NAS_MIXER) #include "mixer_nas.cpp" @@ -97,10 +89,6 @@ #include "mixer_oss4.cpp" #endif -#if defined(HPUX_MIXER) -#include "mixer_hpux.cpp" -#endif - /* #else // We cannot handle this! I install a dummy mixer instead. @@ -145,10 +133,6 @@ MixerFactory g_mixerFactories[] = { { OSS_getMixer, OSS_getDriverName, NULL }, #endif -#if defined(HPUX_MIXER) - { HPUX_getMixer, HPUX_getDriverName, NULL }, -#endif - { NULL, NULL, NULL } }; diff --git a/kmix/mixer_hpux.cpp b/kmix/mixer_hpux.cpp deleted file mode 100644 index 0f491ac9..00000000 --- a/kmix/mixer_hpux.cpp +++ /dev/null @@ -1,257 +0,0 @@ -/* - * KMix -- KDE's full featured mini mixer - * - * - * Copyright (C) 1996-2000 Christian Esken - * esken@kde.org - * - * HP/UX-Port: Copyright (C) 1999 by Helge Deller - * deller@gmx.de - * - * 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_hpux.h" - -#warning "HP/UX mixer (maybe) doesn't work yet !" - -#define HPUX_ERROR_OFFSET 1024 - -#define myGain AUnityGain /* AUnityGain or AZeroGain */ - -#define GAIN_OUT_DIFF ((long) ((int)aMaxOutputGain(audio) - (int)aMinOutputGain(audio))) -#define GAIN_OUT_MIN ((long) aMinOutputGain(audio)) -#define GAIN_IN_DIFF ((long) ((int)aMaxInputGain(audio) - (int)aMinInputGain(audio))) -#define GAIN_IN_MIN ((long) aMinOutputGain(audio)) - -/* standard */ -#define ID_PCM 4 - -/* AInputSrcType: */ /*OSS:*/ -#define ID_IN_MICROPHONE 7 /* AISTMonoMicrophone */ -#define ID_IN_AUX 6 /* AISTLeftAuxiliary, AISTRightAuxiliary */ - -/* AOutputDstType: */ -#define ID_OUT_INT_SPEAKER 0 /* AODTMonoIntSpeaker */ - -/* not yet implemented: - AODTLeftJack, AODTRightJack, - AODTLeftLineOut, AODTRightLineOut, - AODTLeftHeadphone, AODTRightHeadphone - -const char* MixerDevNames[32]={"Volume" , "Bass" , "Treble" , "Synth" , "Pcm" , \ - "Speaker" , "Line" , "Microphone", "CD" , "Mix" , \ - "Pcm2" , "RecMon" , "IGain" , "OGain" , "Line1", \ - "Line2" , "Line3" , "Digital1" , "Digital2", "Digital3", \ - "PhoneIn" , "PhoneOut", "Video" , "Radio" , "Monitor", \ - "3D-depth", "3D-center", "unknown" , "unknown" , "unknown", \ - "unknown" , "unused" }; -*/ - - - -Mixer_HPUX::Mixer_HPUX(int devnum) : Mixer_Backend(devnum) -{ - char ServerName[10]; - ServerName[0] = 0; - audio = AOpenAudio(ServerName,NULL); -} - -Mixer_HPUX::~Mixer_HPUX() -{ - if (audio) { - ACloseAudio(audio,0); - audio = 0; - } -} - - -int Mixer_HPUX::open() -{ - if (audio==0) { - return Mixer::ERR_OPEN; - } - else - { - /* Mixer is open. Now define properties */ - stereodevs = devmask = (1<<ID_PCM); /* activate pcm */ - recmask = 0; - - /* check Input devices... */ - if (AInputSources(audio) & AMonoMicrophoneMask) { - devmask |= (1<<ID_IN_MICROPHONE); - recmask |= (1<<ID_IN_MICROPHONE); - } - if (AInputSources(audio) & (ALeftAuxiliaryMask|ARightAuxiliaryMask)) { - devmask |= (1<<ID_IN_AUX); - recmask |= (1<<ID_IN_AUX); - stereodevs |= (1<<ID_IN_AUX); - } - - /* check Output devices... */ - if (AOutputDestinations(audio) & AMonoIntSpeakerMask) { - devmask |= (1<<ID_OUT_INT_SPEAKER); - stereodevs |= (1<<ID_OUT_INT_SPEAKER); - } - -/* implement later: - ---------------- - if (AOutputDestinations(audio) & AMonoLineOutMask) devmask |= 64; // Line - if (AOutputDestinations(audio) & AMonoJackMask) devmask |= (1<<14); // Line1 - if (AOutputDestinations(audio) & AMonoHeadphoneMask) devmask |= (1<<15); // Line2 -*/ - - MaxVolume = 255; - - long error = 0; - ASetSystemPlayGain(audio, myGain, &error); - if (error) errorText(error + HPUX_ERROR_OFFSET); - ASetSystemRecordGain(audio, myGain, &error); - if (error) errorText(error + HPUX_ERROR_OFFSET); - - i_recsrc = 0; - m_isOpen = true; - - m_mixerName = "HP Mixer"; /* AAudioString(audio); */ - return 0; - } -} - -int Mixer_HPUX::close() -{ - m_isOpen = false; - m_mixDevices.clear(); - return 0; -} - - -/* -void Mixer_HPUX::setDevNumName_I(int devnum) -{ - devname = "HP Mixer"; -} -*/ -bool Mixer_HPUX::setRecsrcHW( int devnum, bool on ) -{ - return false; -} - -bool Mixer_HPUX::isRecsrcHW( int devnum ) -{ - return false; -} - -int Mixer_HPUX::readVolumeFromHW( int devnum, Volume &vol ) -{ - long Gain; - long error = 0; - int vl,vr; - - switch (devnum) { - case ID_OUT_INT_SPEAKER: /* AODTMonoIntSpeaker */ - AGetSystemChannelGain(audio, ASGTPlay, ACTMono, &Gain, &error ); - vl = vr = (Gain-GAIN_OUT_MIN)*255 / GAIN_OUT_DIFF; - vol.setVolume( Volume::LEFT, vl); - vol.setVolume( Volume::RIGHT, vr); -printf("READ - Devnum: %d, Left: %d, Right: %d\n", devnum, vl, vr ); - break; - - case ID_IN_AUX: /* AISTLeftAuxiliary, AISTRightAuxiliary */ - case ID_IN_MICROPHONE: /* AISTMonoMicrophone */ - AGetSystemChannelGain(audio, ASGTRecord, ACTMono, &Gain, &error ); - vl = vr = (Gain-GAIN_IN_MIN)*255 / GAIN_IN_DIFF; - vol.setVolume( Volume::LEFT, vl); - vol.setVolume( Volume::RIGHT, vr); - break; - - default: - error = Mixer::ERR_NODEV - HPUX_ERROR_OFFSET; - break; - }; - - return (error ? (error+HPUX_ERROR_OFFSET) : 0); -} - -/* - ASystemGainType = ASGTPlay, ASGTRecord, ASGTMonitor - AChType = ACTMono, ACTLeft, ACTRight -*/ - -int Mixer_HPUX::writeVolumeToHW( int devnum, Volume& vol ) -{ - long Gain; - long error = 0; - int vl = vol.getVolume(Volume::LEFT); - int vr = vol.getVolume(Volume::RIGHT); - - switch (devnum) { - case ID_OUT_INT_SPEAKER: /* AODTMonoIntSpeaker */ -printf("WRITE - Devnum: %d, Left: %d, Right: %d\n", devnum, vl, vr); - Gain = vl; // only left Volume - Gain = (Gain*GAIN_OUT_DIFF) / 255 - GAIN_OUT_MIN; - ASetSystemChannelGain(audio, ASGTPlay, ACTMono, (AGainDB) Gain, &error ); - break; - - case ID_IN_MICROPHONE: /* AISTMonoMicrophone */ - Gain = vl; // only left Volume - Gain = (Gain*GAIN_IN_DIFF) / 255 - GAIN_IN_MIN; - ASetSystemChannelGain(audio, ASGTRecord, ACTMono, (AGainDB) Gain, &error ); - break; - - case ID_IN_AUX: /* AISTLeftAuxiliary, AISTRightAuxiliary */ - Gain = (vl*GAIN_IN_DIFF) / 255 - GAIN_IN_MIN; - ASetSystemChannelGain(audio, ASGTRecord, ACTLeft, (AGainDB) Gain, &error ); - Gain = (vr*GAIN_IN_DIFF) / 255 - GAIN_IN_MIN; - ASetSystemChannelGain(audio, ASGTRecord, ACTRight, (AGainDB) Gain, &error ); - break; - - default: - error = Mixer::ERR_NODEV - HPUX_ERROR_OFFSET; - break; - }; - return (error ? (error+HPUX_ERROR_OFFSET) : 0); -} - - -TQString Mixer_HPUX::errorText(int mixer_error) -{ - TQString l_s_errmsg; - if (mixer_error >= HPUX_ERROR_OFFSET) { - char errorstr[200]; - AGetErrorText(audio, (AError) (mixer_error-HPUX_ERROR_OFFSET), - errorstr, sizeof(errorstr)); - printf("kmix: %s: %s\n",mixerName().data(), errorstr); - l_s_errmsg = errorstr; - } else - switch (mixer_error) - { - case Mixer::ERR_OPEN: - // should use i18n... - l_s_errmsg = "kmix: HP-UX Alib-Mixer cannot be found.\n" \ - "Please check that you have:\n" \ - " 1. Installed the libAlib package and\n" \ - " 2. started the Aserver program from the /opt/audio/bin directory\n"; - break; - default: - l_s_errmsg = Mixer_Backend::errorText(mixer_error); - break; - } - return l_s_errmsg; -} - -TQString HPUX_getDriverName() { - return "HPUX"; -} - diff --git a/kmix/mixer_hpux.h b/kmix/mixer_hpux.h deleted file mode 100644 index 410758c9..00000000 --- a/kmix/mixer_hpux.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef MIXER_HPUX_H -#define MIXER_HPUX_H - -#define DEFAULT_MIXER "HP-UX Mixer" -#ifdef HAVE_ALIB_H -#include <Alib.h> -#define HPUX_MIXER -#endif - -#include "mixer_backend.h" - -class Mixer_HPUX : public Mixer_Backend -{ -public: - Mixer_HPUX(int devnum); - virtual ~Mixer_HPUX(); - - virtual TQString errorText(int mixer_error); - - virtual int readVolumeFromHW( int devnum, Volume &vol ); - virtual int writeVolumeToHW( int devnum, Volume &vol ); - -protected: - virtual bool setRecsrcHW( int devnum, bool on = true ); - virtual bool isRecsrcHW( int devnum ); - - virtual int open(); - virtual int close(); - - Audio *audio; - unsigned int stereodevs,devmask, recmask, MaxVolume, i_recsrc; - - -}; - -#endif diff --git a/kmix/mixer_irix.cpp b/kmix/mixer_irix.cpp index eb407567..728f2b41 100644 --- a/kmix/mixer_irix.cpp +++ b/kmix/mixer_irix.cpp @@ -58,7 +58,7 @@ int Mixer_IRIX::open() stereodevs = 1+128+2048; MaxVolume = 255; - i_s_mixer_name = "HPUX Audio Mixer"; + i_s_mixer_name = "IRIX Audio Mixer"; isOpen = true; return 0; diff --git a/kscd/Makefile.am b/kscd/Makefile.am index 93297cb5..82f205a4 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_hpux.c:config.h plat_irix.c:config.h plat_linux.c:config.h plat_news.c:config.h diff --git a/kscd/configure.in.in b/kscd/configure.in.in index 9f92c1a7..444833f3 100644 --- a/kscd/configure.in.in +++ b/kscd/configure.in.in @@ -10,8 +10,6 @@ AC_SUBST(LIBCDROM) dnl Checks for libraries. dnl added by wuebben Nov 27 1997 -AC_CHECK_LIB(Alib, main, [LIBALIB="-lAlib"]) dnl HP-UX network audio server -AC_SUBST(LIBALIB) AC_CHECK_LIB(audio,main,[LIBAUDIO="-laudio"]) dnl SunOS audio driver AC_SUBST(LIBAUDIO) AC_CHECK_LIB(mme, main, [LIBMME="-lmme";EXTRAINCS="-I/usr/include/mme"]) dnl DEC MMS audio server diff --git a/kscd/kscd-script b/kscd/kscd-script index 27de2d26..18803ee2 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 " HPUX ....................... H" echo " Irix ....................... I" echo " Sony NEWS .................. N" echo " Ultrix ..................... U" @@ -242,38 +241,6 @@ echo "#endif /* sgi */" >> $config_file } -hp_conf(){ - -clear -echo "KSCD configuration for HPUX systems" -echo "-----------------------------------" -echo - -give_instructions -write_config_header - -echo "" >> $config_file -echo "#if defined(hpux) || defined (__hpux)" >> $config_file -echo "" >> $config_file - -echo $ac_n "Please specify your cdrom device [/dev/rscsi]:$ac_c" - -read device -if [ "$device" = "" ] -then - device="/dev/rcsci" -fi - -echo "Your choice was: $device" -echo "#define DEFAULT_CD_DEVICE \"$device\" " >> $config_file -echo "" -echo "That's all for HPUX ..." - -echo "#endif /* hpux */" >> $config_file - - -} - bsd386_conf(){ clear @@ -717,7 +684,6 @@ l|L) linux_conf;; f|F) freebsd_netbsd_conf;; b|B) bsd386_conf;; s|S) sun_conf;; -h|H) hp_conf;; i|I) irix_conf;; n|N) sony_conf;; u|U) ultrix_conf;; diff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt index ae7832b0..08b35ebf 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_hpux.c plat_irix.c + plat_aix.c plat_bsd386.c plat_freebsd.c plat_irix.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 b46b371a..c5269d7c 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_hpux.c plat_irix.c \ +plat_aix.c plat_bsd386.c plat_freebsd.c plat_irix.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 93ac8c5c..52719d3d 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|hpux |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 | X | -wmcd_close() | - | - | - | - | - | - | X | - | - | - | - | -wmcd_reopen() | X | X | X | X | X | X | X | X | X | X | X | -wm_scsi() | \ | \ | \ | X | \ | X | \ | \ | \ | X | \ | -keep_cd_open() | - | - | - | - | - | \ | - | - | - | - | - | -gen_get_drive_status() | X | X | X | X | X | X | X | X | X | X | X | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ -gen_get_trackcount() | X | X | X | X | X | X | X | X | X | X | X | -gen_get_trackinfo() | X | X | X | X | X | X | X | X | X | X | X | -gen_get_cdlen() | X | X | X | X | X | X | X | X | X | X | X | -------------------------+-----+------+-------+-----+-----+-----+-----+-------+-----+-----+------+ -gen_play() | X | X | X | X | X | X | X | X | X | X | X | -gen_pause() | X | X | X | X | X | X | X | X | X | X | X | -gen_resume() | X | X | X | X | X | X | X | X | X | X | X | -gen_stop() | X | X | X | X | X | X | X | X | X | X | X | -gen_eject() | X | X | X | X | X | X | X | X | X | X | X | -gen_closetray() | X | 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 | X | -gen_get_volume() | X | 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|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() | - | - | - | - | \ | - | - | - | - | - | +------------------------+-----+------+-------+-----+-----+-----+-------+-----+-----+------+ diff --git a/kscd/libwm/include/wm_config.h b/kscd/libwm/include/wm_config.h index a2f2640a..27bb970c 100644 --- a/kscd/libwm/include/wm_config.h +++ b/kscd/libwm/include/wm_config.h @@ -40,7 +40,6 @@ ********************* * BSD386 * FreeBSD - * HP-UX * Irix (SGI) * Linux * News (Sony NewsOS) @@ -163,21 +162,6 @@ #endif /* netbsd */ /****************************************************************** - * HP-UX - ****************************************************************** - *** ** ** ********* ** ** ** *************************** - *** ** ** ** ******** ** *** **************************** - *** ** *** ** ** **** ***************************** - *** ** ** ************ ** *** **************************** - *** ** ** ************* *** ** *************************** - ******************************************************************/ -#if defined(hpux) || defined (__hpux) - -#define DEFAULT_CD_DEVICE "/dev/rscsi" - -#endif /* hpux */ - -/****************************************************************** * OpenBSD ****************************************************************** **** **** *** ** *** ** **** *** ******** diff --git a/kscd/libwm/plat_hpux.c b/kscd/libwm/plat_hpux.c deleted file mode 100644 index ef722437..00000000 --- a/kscd/libwm/plat_hpux.c +++ /dev/null @@ -1,350 +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 - * - * - * HP/UX-specific drive control routines. - */ - -#if defined(hpux) || defined(__hpux) - -#include <errno.h> -#include <stdio.h> -#include <fcntl.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/param.h> -#include <sys/stat.h> -#include <sys/statfs.h> - -#include "include/wm_config.h" - -#include <sys/time.h> -#include <sys/scsi.h> - -#include "include/wm_struct.h" -#include "include/wm_helpers.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; - -/*--------------------------------------------------------* - * Initialize the drive. A no-op for the generic driver. - *--------------------------------------------------------*/ -int -gen_init( struct wm_drive *d ) -{ - 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, flag = 1; - static int warned = 0; - /* unsigned ? */ - char vendor[32], model[32], rev[32]; - - if (d->fd >= 0) /* Device already open? */ - { - wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wmcd_open(): [device is open (fd=%d)]\n", d->fd); - return (0); - } - - if (d->cd_device == NULL) - d->cd_device = DEFAULT_CD_DEVICE; - - d->fd = open(d->cd_device, O_RDWR); - if (d->fd < 0) - { - if (errno == EACCES) - { - return -EACCES; - } - else if (errno != EINTR) - { - return (-6); - } - - /* No CD in drive. */ - return (1); - } - - /* Prepare the device to receive raw SCSI commands. */ - if (ioctl(d->fd, SIOC_CMD_MODE, &flag) < 0) - { - fprintf(stderr, "%s: SIOC_CMD_MODE: true: %s\n", - d->cd_device, strerror(errno)); - /*exit(1);*/ - } - - /* Now fill in the relevant parts of the wm_drive structure. */ - fd = d->fd; - - /* Default drive is the HP one, which might not respond to INQUIRY */ - strcpy(&vendor, "TOSHIBA"); - strcpy(&model, "XM-3301"); - rev[0] = '\0'; - wm_scsi_get_drive_type(d, vendor, model, rev); - find_drive_struct(vendor, model, rev); - - d->fd = fd; - - (d->init)(d); - - 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 *cdb, int cdblen, - void *retbuf, int retbuflen, int getreply ) -{ -#ifdef SIOC_IO - struct sctl_io cmd; - - memset(&cmd, 0, sizeof(cmd)); - cmd.cdb_length = cdblen; - cmd.data = retbuf; - cmd.data_length = retbuflen; - cmd.max_msecs = 1000; - cmd.flags = getreply ? SCTL_READ : 0; - memcpy(cmd.cdb, cdb, cdblen); - - return (ioctl(d->fd, SIOC_IO, &cmd)); -#else - /* this code, for pre-9.0, is BROKEN! ugh. */ - char reply_buf[12]; - struct scsi_cmd_parms cmd; - - memset(&cmd, 0, sizeof(cmd)); - cmd.clock_ticks = 500; - cmd.cmd_mode = 1; - cmd.cmd_type = cdblen; - memcpy(cmd.command, cdb, cdblen); - if (ioctl(d->fd, SIOC_SET_CMD, &cmd) < 0) - return (-1); - - if (! retbuf || ! retbuflen) - (void) read(d->fd, reply_buf, sizeof(reply_buf)); - else if (getreply) - { - if (read(d->fd, retbuf, retbuflen) < 0) - return (-1); - } - else - if (write(d->fd, retbuf, retbuflen) < 0) - return (-1); - - return (0); -#endif -} /* 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 ) -{ - return (wm_scsi2_get_drive_status(d, oldmode, mode, pos, track, index)); -} /* gen_get_drive_status() */ - -/*-------------------------------------* - * Get the number of tracks on the CD. - *-------------------------------------*/ -int -gen_get_trackcount(struct wm_drive *d, int *tracks ) -{ - return (wm_scsi2_get_trackcount(d, tracks)); -} /* 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) -{ - return (wm_scsi2_get_trackinfo(d, track, data, startframe)); -} /* gen_get_trackinfo() */ - -/*-------------------------------------* - * Get the number of frames on the CD. - *-------------------------------------*/ -int -gen_get_cdlen(struct wm_drive *d, int *frames) -{ - int tmp; - - return (wm_scsi2_get_cdlen(d, frames)); -} /* 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 ) -{ - return (wm_scsi2_play(d, start, end)); -} /* gen_play() */ - -/*---------------* - * Pause the CD. - *---------------*/ -int -gen_pause( struct wm_drive *d ) -{ - return (wm_scsi2_pause(d)); -} /* gen_pause() */ - -/*-------------------------------------------------* - * Resume playing the CD (assuming it was paused.) - *-------------------------------------------------*/ -int -gen_resume( struct wm_drive *d ) -{ - return (wm_scsi2_resume(d)); -} /* gen_resume() */ - -/*--------------* - * Stop the CD. - *--------------*/ -int -gen_stop( struct wm_drive *d ) -{ - return (wm_scsi2_stop(d)); -} /* gen_stop() */ - - -/*----------------------------------------* - * Eject the current CD, if there is one. - *----------------------------------------*/ -int -gen_eject( struct wm_drive *d ) -{ - struct stat stbuf; - struct statfs sfsbuf; - - if (fstat(d->fd, &stbuf) != 0) - return (-2); - - /* Is this a mounted filesystem? */ - if (fstatfs(d->fd, &sfsbuf) == 0) - return (-3); - - return (wm_scsi2_eject(d)); -} /* gen_eject() */ - -/*----------------------------------------* - * Close the CD tray - *----------------------------------------*/ -int -gen_closetray(struct wm_drive *d) -{ -#ifdef CAN_CLOSE - return (wm_scsi2_closetray(d)); -#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 ) -{ - return (wm_scsi2_set_volume(d, left, right)); -} /* 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 ) -{ - return (wm_scsi2_get_volume(d, left, right)); -} /* 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) -{ - /* This needs to be tested ! */ - return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length); -} /* gen_get_cdtext() */ - - -#endif - - diff --git a/kscd/libwm/plat_svr4.c b/kscd/libwm/plat_svr4.c index e0ddcb94..182ec872 100644 --- a/kscd/libwm/plat_svr4.c +++ b/kscd/libwm/plat_svr4.c @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * * - * SVR4 specific. Much of this is similar to plat_hpux.c. + * SVR4 specific. */ static char plat_svr4_id[] = "$Id$"; diff --git a/mpeglib/configure.in.in b/mpeglib/configure.in.in index e90b7539..d5ad4fd0 100644 --- a/mpeglib/configure.in.in +++ b/mpeglib/configure.in.in @@ -223,11 +223,6 @@ case "$OS_TYPE" in AC_DEFINE(OS_IRIX,1,[Define if you have iris]) ;; - HPUX) - AC_MSG_RESULT([HPUX :Unknown hardware. You will have problems!!]) - AC_DEFINE(OS_HPUX,1,[Define if you have HP_UX]) - ;; - *) AC_MSG_RESULT([Very Unknown hardware. **Better give up!**]) ;; diff --git a/mpeglib/lib/input/cdromAccess.cpp b/mpeglib/lib/input/cdromAccess.cpp index 98d49779..6e339c58 100644 --- a/mpeglib/lib/input/cdromAccess.cpp +++ b/mpeglib/lib/input/cdromAccess.cpp @@ -35,10 +35,6 @@ #include "cdromAccess_Empty.cpp" #endif -#ifdef OS_HPUX - #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 eab414c7..de74ff1c 100644 --- a/mpeglib/lib/util/audio/Makefile.am +++ b/mpeglib/lib/util/audio/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = $(all_includes) EXTRA_DIST = audioIO_AIX.cpp audioIO_BeOS.cpp \ - audioIO_HPUX.cpp \ audioIO_IRIX.cpp audioIO_Linux.cpp \ audioIO_SunOS.cpp audioIO_SDL.cpp diff --git a/mpeglib/lib/util/audio/audioIO.cpp b/mpeglib/lib/util/audio/audioIO.cpp index ec84aa21..ca445119 100644 --- a/mpeglib/lib/util/audio/audioIO.cpp +++ b/mpeglib/lib/util/audio/audioIO.cpp @@ -39,10 +39,6 @@ #include "audioIO_IRIX.cpp" #endif -#ifdef OS_HPUX - #include "audioIO_HPUX.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 41e1ceb2..7de04c99 100644 --- a/mpeglib/lib/util/audio/audioIO.h +++ b/mpeglib/lib/util/audio/audioIO.h @@ -39,10 +39,6 @@ extern "C" { #define AUSIZ 32768 #endif -#ifdef OS_HPUX - #define AUSIZ 4096 -#endif - #ifdef OS_SunOS #define AUSIZ 4096 #endif diff --git a/mpeglib/lib/util/audio/audioIO_HPUX.cpp b/mpeglib/lib/util/audio/audioIO_HPUX.cpp deleted file mode 100644 index ae07a148..00000000 --- a/mpeglib/lib/util/audio/audioIO_HPUX.cpp +++ /dev/null @@ -1,190 +0,0 @@ -/* this file is a part of amp software, (C) tomislav uzelac 1996,1997 - - Origional code by: Lutz Vieweg - Modified by: - * Andrew Richards - moved code from audio.c - - */ - - -#include <sys/audio.h> -#include <fcntl.h> -#include <sys/ioctl.h> -#include <sys/lock.h> -#include <unistd.h> -#include <stdio.h> -#include "audioIO.h" - -/* declare these static to effectively isolate the audio device */ - -static int audio_fd; - - -/* 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() { - if ((audio_fd = open("/dev/audio",O_RDWR))==-1) - die(" unable to open the audio device\n"); - - DB(audio, msg("Audio device opened on %d\n",audio_fd); ) - } - - -void -audioInit(int sampleSize,int frequency, int stereo) -{ - int flags; - int failed = 0; - int volume=100; - - if ((flags = fcntl (audio_fd, F_GETFL, 0)) < 0) { - die("unable to set non-blocking mode for /dev/audio\n"); - } - flags |= O_NDELAY; - if (fcntl (audio_fd, F_SETFL, flags) < 0) { - die("unable to set non-blocking mode for /dev/audio\n"); - } - - if ( ioctl(audio_fd, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_LINEAR16BIT) < 0 || - ioctl(audio_fd, AUDIO_SET_CHANNELS, stereo ? 2 : 1) < 0 || - ioctl(audio_fd, AUDIO_SET_OUTPUT, AUDIO_OUT_SPEAKER | AUDIO_OUT_HEADPHONE - | AUDIO_OUT_LINE) < 0 || - ioctl(audio_fd, AUDIO_SET_SAMPLE_RATE, frequency) < 0) { - failed = -1; - } - if (volume != -1) { - struct audio_describe description; - struct audio_gains gains; - float fvolume = (float)volume / 100.0f; - if (ioctl(audio_fd, AUDIO_DESCRIBE, &description)) { - failed = -1; - } - if (ioctl (audio_fd, AUDIO_GET_GAINS, &gains)) { - failed = -1; - } - - gains.transmit_gain = (int)((float)description.min_transmit_gain + - (float)(description.max_transmit_gain - - description.min_transmit_gain) - * fvolume); - - /* gains.monitor_gain = description.min_monitor_gain; */ /* don't monitor ! */ - - if (ioctl (audio_fd, AUDIO_SET_GAINS, &gains)) { - failed = -1; - } - } - - if (ioctl(audio_fd, AUDIO_SET_TXBUFSIZE, 4096 * 8)) { - failed = -1; - } - if (failed) - die(" unable to setup /dev/audio\n"); -} - - -/* audioSetVolume - only code this if your system can change the volume while */ -/* playing. sets the output volume 0-100 */ - -void -audioSetVolume(int volume) -{ - struct audio_describe description; - struct audio_gains gains; - int failed = 0; - float fvolume = ((float)volume) / 100.0f; - if (ioctl(audio_fd, AUDIO_DESCRIBE, &description)) { - failed = -1; - } - if (ioctl (audio_fd, AUDIO_GET_GAINS, &gains)) { - failed = -1; -} - - gains.transmit_gain = (int)((float)description.min_transmit_gain + - (float)(description.max_transmit_gain - - description.min_transmit_gain) - * fvolume); - if (ioctl (audio_fd, AUDIO_SET_GAINS, &gains)) { - failed = -1; - } - - /* could evaluate "failed" here - but who cares? */ - - DB(audio, msg("volume set to %d%%\n",volume); ) - -} - -/* audioFlush() */ -/* should flush the audio device */ - -inline void -audioFlush() -{ - DB(audio, msg("audio: flush %d\n",audio_fd) ); -} - - -/* audioClose() */ -/* should close the audio device and perform any special shutdown */ - -void -audioClose() -{ - close(audio_fd); - 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) -{ - DB(audio, msg("audio: Writing %d bytes to audio descriptor %d\n",count,getAudioFd()) ); - return(write(audio_fd,buffer,count)); -} - - -/* 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(audio_fd); -} - -/* - Try to set the priority of this process to a value which - allows us to play without buffering, thus saving memory - and avoiding cache-misses. - If we cannot get any priority high enough to allow for - undisturbed replay (because we don't have sufficient - privilege), return a zero, otherwise, return a one. -*/ -int audioSetPriority(void) { - - /* try to lock process in physical memory, just ignore if this fails */ - plock(PROCSHLIBLOCK); - - /* try to set a realtime-priority of 64 */ - if (-1 != rtprio(0, 64)) { - DB(audio, msg("using real-time priority\n"); ) - return 1; - } - - /* try to set a nice-level of -20 */ - if (-1 != nice(-20)) { - DB(audio, msg("using nice-level -20\n"); ) - return 1; - } - - DB(audio, msg("using buffered output\n"); ) - return 0; /* need to use a buffer */ -} diff --git a/mpg123_artsplugin/mpg123/audio.h b/mpg123_artsplugin/mpg123/audio.h index 78a6e0b3..96787df4 100644 --- a/mpg123_artsplugin/mpg123/audio.h +++ b/mpg123_artsplugin/mpg123/audio.h @@ -24,7 +24,7 @@ enum { DECODE_TEST, DECODE_AUDIO, DECODE_FILE, DECODE_BUFFER, DECODE_WAV, #define AUDIO_RATE_TOLERANCE 3 #if 0 -#if defined(HPUX) || defined(SUNOS) || defined(SOLARIS) || defined(OSS) || defined(__NetBSD__) || defined(SPARCLINUX) || defined(__FreeBSD__) +#if defined(SUNOS) || defined(SOLARIS) || defined(OSS) || defined(__NetBSD__) || defined(SPARCLINUX) || defined(__FreeBSD__) #endif #endif diff --git a/mpg123_artsplugin/mpg123/mpg123.h b/mpg123_artsplugin/mpg123/mpg123.h index 9c61a4ce..64de18cc 100644 --- a/mpg123_artsplugin/mpg123/mpg123.h +++ b/mpg123_artsplugin/mpg123/mpg123.h @@ -21,10 +21,6 @@ typedef unsigned char byte; #endif #define MPG123_REMOTE -#ifdef HPUX -#define random rand -#define srandom srand -#endif #define FRONTEND_NONE 0 #define FRONTEND_SAJBER 1 diff --git a/mpg123_artsplugin/mpg123/xfermem.c b/mpg123_artsplugin/mpg123/xfermem.c index 8e43dab4..c5f98a88 100644 --- a/mpg123_artsplugin/mpg123/xfermem.c +++ b/mpg123_artsplugin/mpg123/xfermem.c @@ -163,12 +163,7 @@ int xfermem_getcmd (int fd, int block) FD_ZERO (&selfds); FD_SET (fd, &selfds); - /* #ifdef HPUX */ /* seems to trigger performance problems? strange */ -#if 0 - switch (select(FD_SETSIZE, (int *) &selfds, NULL, NULL, block ? NULL : &selto)) { -#else switch (select(FD_SETSIZE, &selfds, NULL, NULL, block ? NULL : &selto)) { -#endif case 0: if (!block) return (0); diff --git a/xine_artsplugin/configure.in.in b/xine_artsplugin/configure.in.in index 7797d223..166eef4c 100644 --- a/xine_artsplugin/configure.in.in +++ b/xine_artsplugin/configure.in.in @@ -103,7 +103,6 @@ main () system ("touch conf.xinetest"); - /* HP/UX 9 (%@#!) writes to sscanf strings */ tmp_version = (char *) strdup("$min_xine_version"); if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &sub) != 3) { printf("%s, bad version string\n", "$min_xine_version"); |