improve mixer code

1 files changed, 10 insertions, 4 deletions

diff --git a/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp b/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
index f74a1b9..b18d719 100644
--- a/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
+++ b/examples/opiemm/osoundsystemdemo/osoundsystemdemo.cpp
@@ -1,66 +1,72 @@
 /*
                =.            This file is part of the Opie Project
              .=l.            Copyright (C) 2004 Opie Team <opie-devel@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       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; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 /* OPIE */
 #include <opie2/osoundsystem.h>
 #include <opie2/odebug.h>
 
 using namespace Opie::MM;
 
 int main( int argc, char** argv )
 {
     odebug << "OPIE Sound System Demo" << oendl;
 
     OSoundSystem* sound = OSoundSystem::instance();
 
     OSoundSystem::CardIterator it = sound->iterator();
 /*
     while ( it.current() )
     {
         odebug << "DEMO: OSoundSystem contains Interface '" <<  it.current()->name() << "'" << oendl;
         ++it;
     }
 
 */
     OSoundCard* card = it.current();
-
     OMixerInterface* mixer = card->mixer();
+    odebug << "This device " << ( mixer->hasMultipleRecording() ? "does" : "does not" ) << " feature multiple recording sources." << oendl;
 
     QStringList channels = mixer->allChannels();
 
     for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it )
     {
         bool stereo = mixer->isStereo( *it );
-        odebug << "OSSDEMO: Mixer has channel " << *it << ( stereo ? "[stereo]" : "[mono]" ) << oendl;
-        odebug << "OSSDEMO:              +--- volume " << ( mixer->volume( *it ) & 0xff )
-               << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl;
+        bool recsrc = mixer->isRecordable( *it );
+        QString line = "OSSDEMO: Mixer has channel " + *it + " ";
+        line = line.leftJustify( 50 ) + ( stereo ? "[stereo]" : "[mono]" );
+        line = line.leftJustify( 60 ) + ( recsrc ? "[recsrc]" : "[      ]" );
+        line = line.leftJustify( 70 );
+        line += " [ " + QString::number( mixer->volume( *it ) & 0xff ).rightJustify( 3 );
+        if ( stereo ) line += " | " + QString::number( mixer->volume( *it ) >> 8 ).rightJustify( 3 );
+        line += " ]";
+        odebug << line << oendl;
     }
 
     return 0;
 
 }