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

List:       kde-solaris
Subject:    [kde-solaris] kdemultimedia: Bug in mixer_sun.cpp (cvs)
From:       Mats Rojestal <mats.rojestal () bredband ! net>
Date:       2004-11-27 13:58:33
Message-ID: 41A88809.200 () bredband ! net
[Download RAW message or body]

Hi,

There is a problem which was introduced with the recent change
in kmix and mixer_sun.cpp won't compile.
Here is a patch that fixes that problem and a problem in mpeglib_artsplug.

--Mats R

PS kdemultimedia compiles fine if CONFIG_SHELL is set to /bin/bash
    before running configure

["mixer_sun.cpp.diff" (text/plain)]

Index: mixer_sun.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kmix/mixer_sun.cpp,v
retrieving revision 1.22
diff -u -r1.22 mixer_sun.cpp
--- mixer_sun.cpp	24 Aug 2004 15:59:44 -0000	1.22
+++ mixer_sun.cpp	27 Nov 2004 13:42:04 -0000
@@ -422,8 +422,8 @@
 //======================================================================
 void Mixer_SUN::VolumeToGainBalance( Volume& volume, uint_t& gain, uchar_t& balance )
 {
-   if ( ( volume.channels() == 1 ) ||
-        ( volume[Volume::LEFT] == volume[Volume::RIGHT] ) )
+  if ( (volume.count() == 1 ) ||
+       (volume[Volume::LEFT] == volume[Volume::RIGHT] ))
    {
       gain = volume[Volume::LEFT];
       balance = AUDIO_MID_BALANCE;
@@ -454,7 +454,7 @@
 //======================================================================
 void Mixer_SUN::GainBalanceToVolume( uint_t& gain, uchar_t& balance, Volume& volume )
 {
-   if ( volume.channels() == 1 )
+  if ( volume.count() == 1 )
    {
       volume.setVolume( Volume::LEFT, gain );
    }

["decoderBaseObject_impl.h.diff" (text/plain)]

Index: decoderBaseObject_impl.h
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/decoderBaseObject_impl.h,v
retrieving revision 1.13
diff -u -r1.13 decoderBaseObject_impl.h
--- decoderBaseObject_impl.h	27 Jun 2003 01:36:58 -0000	1.13
+++ decoderBaseObject_impl.h	27 Nov 2004 13:55:20 -0000
@@ -64,7 +64,7 @@
 
   bool m_streaming;
 
-  queue<DataPacket<mcopbyte>*> *m_packetQueue;
+  std::queue<DataPacket<mcopbyte>*> *m_packetQueue;
 
 public:
 


___________________________________________________
This message is from the kde-solaris mailing list.
Account management:  https://mail.kde.org/mailman/listinfo/kde-solaris.
Archives: http://lists.kde.org/.
More info: http://www.kde.org/faq.html.

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