diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-01-31 21:49:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-01 17:55:58 +0900 |
| commit | ad9ea3eca03ac1ca9f05d616ea39867404d1929f (patch) | |
| tree | aea33520c21e91e0c282be42ced5c3a0a4afe9cd /kmix | |
| parent | 71b08faeff50be3dad649cae33dbea7599bf5102 (diff) | |
| download | tdemultimedia-master.tar.gz tdemultimedia-master.zip | |
Remove support for Irix, which is discontinued and does not provide a c++17 complaint compiler.HEADmaster
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kmix')
| -rw-r--r-- | kmix/TODO | 4 | ||||
| -rw-r--r-- | kmix/kmix-platforms.cpp | 13 | ||||
| -rw-r--r-- | kmix/mixer_backend.h | 2 | ||||
| -rw-r--r-- | kmix/mixer_irix.cpp | 133 | ||||
| -rw-r--r-- | kmix/mixer_irix.h | 28 |
5 files changed, 1 insertions, 179 deletions
@@ -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 |
