[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Christian Esken <esken () kde ! org>
Date:       2011-08-10 19:47:35
Message-ID: 20110810194735.548C9AC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1246245 by esken:

SGI retired IRIX 5 years ago (end of 9/2006). Remove the non-maintained and not \
working IRIX backend.

 M  +0 -1      doc/kmix/index.docbook  
 M  +0 -3      kmix/TODO  
 M  +1 -1      kmix/apps/kmix.cpp  
 M  +1 -2      kmix/apps/main.cpp  
 M  +0 -14     kmix/backends/kmix-backends.cpp  
 M  +3 -2      kmix/backends/mixer_backend.h  
 D             kmix/backends/mixer_irix.cpp  
 D             kmix/backends/mixer_irix.h  


--- trunk/KDE/kdemultimedia/doc/kmix/index.docbook #1246244:1246245
@@ -82,7 +82,6 @@
 <listitem><para> The ALSA soundcard driver.</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> &HP-UX; based machines.</para></listitem>
 </itemizedlist>-->
 
--- trunk/KDE/kdemultimedia/kmix/TODO #1246244:1246245
@@ -82,9 +82,6 @@
 OK
 
 
-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.
--- trunk/KDE/kdemultimedia/kmix/apps/kmix.cpp #1246244:1246245
@@ -1,7 +1,7 @@
 /*
  * KMix -- KDE's full featured mini mixer
  *
- * Copyright 1996-2000 Christian Esken <esken@kde.org>
+ * Copyright 1996-2011 Christian Esken <esken@kde.org>
  * Copyright 2000-2003 Christian Esken <esken@kde.org>, Stefan Schimanski \
                <1Stein@gmx.de>
  * Copyright 2002-2007 Christian Esken <esken@kde.org>, Helio Chissini de Castro \
                <helio@conectiva.com.br>
  *
--- trunk/KDE/kdemultimedia/kmix/apps/main.cpp #1246244:1246245
@@ -41,8 +41,7 @@
    aboutData.addAuthor(ki18n("Christian Esken"), ki18n("Current maintainer"), \
"esken@kde.org");  aboutData.addAuthor(ki18n("Helio Chissini de Castro"), \
ki18n("Co-maintainer, Alsa 0.9x port"), "helio@kde.org" );  \
aboutData.addAuthor(ki18n("Brian Hanson")      , ki18n("Solaris port"), \
                "bhanson@hotmail.com");
-/* The SGI and HP/UX ports are not maintained anymore, and no official part of KMix \
                anymore
-   aboutData.addAuthor(ki18n("Paul Kendall")      , ki18n("SGI Port"), \
"paul@orion.co.nz"); +/* The HP/UX port is not maintained anymore, and no official \
part of KMix anymore  aboutData.addAuthor(ki18n("Helge Deller")      , ki18n("HP/UX \
                port"), "deller@gmx.de");
 */
    aboutData.addCredit(ki18n("Stefan Schimanski") , ki18n("Temporary maintainer"), \
                "schimmi@kde.org");
--- trunk/KDE/kdemultimedia/kmix/backends/kmix-backends.cpp #1246244:1246245
@@ -36,11 +36,6 @@
 #define SUN_MIXER
 #endif
 
-#ifdef sgi
-#include <sys/fcntl.h>
-#define IRIX_MIXER
-#endif
-
 #ifdef __linux__
 
 #ifdef HAVE_LIBASOUND2
@@ -77,10 +72,6 @@
 #include "backends/mixer_sun.cpp"
 #endif
 
-#if defined(IRIX_MIXER)
-#include "backends/mixer_irix.cpp"
-#endif
-
 // Alsa API's 
 #if defined(ALSA_MIXER)
 #include "backends/mixer_alsa9.cpp"
@@ -135,11 +126,6 @@
     { SUN_getMixer, SUN_getDriverName },
 #endif
 
-    
-#if defined(IRIX_MIXER)
-    { IRIX_getMixer, IRIX_getDriverName },
-#endif
-
 #if defined(PULSE_MIXER)
     { PULSE_getMixer, PULSE_getDriverName },
 #endif
--- trunk/KDE/kdemultimedia/kmix/backends/mixer_backend.h #1246244:1246245
@@ -115,8 +115,9 @@
    virtual QString& udi() { return _udi; };
 
   int m_devnum;
-  /// User friendly name of the Mixer (e.g. "IRIX Audio Mixer"). If your mixer API
-  /// gives you a usable name, use that name.
+  /**
+   * User friendly name of the Mixer (e.g. "USB 7.1 Surround System"). If your mixer \
API gives you a usable name, use that name. +   */
   QString m_mixerName;
   // All controls of this card
   MixSet m_mixDevices;


[prev in list] [next in list] [prev in thread] [next in thread]