Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./noatun/modules/voiceprint/voiceprint.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./noatun/modules/voiceprint/voiceprint.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./noatun/modules/winskin/vis/winSkinFFT_impl.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./noatun/modules/winskin/vis/winSkinFFT_impl.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./oggvorbis_artsplugin/oggPlayObject_impl.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./oggvorbis_artsplugin/oggPlayObject_impl.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./oggvorbis_artsplugin/oggPlayObject_impl.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./oggvorbis_artsplugin/oggPlayObject_impl.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./arts/modules/synth/synth_play_pat_impl.cc.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./arts/modules/synth/synth_play_pat_impl.cc
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kioslave/audiocd/plugins/wav/encodercda.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kioslave/audiocd/plugins/wav/encodercda.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kioslave/audiocd/plugins/wav/encodercda.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kioslave/audiocd/plugins/wav/encodercda.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./mpeglib/lib/input/cdromRawAccess.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./mpeglib/lib/input/cdromRawAccess.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./mpeglib/lib/input/inputDetector.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./mpeglib/lib/input/inputDetector.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./mpeglib/lib/input/fileAccessWrapper.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./mpeglib/lib/input/fileAccessWrapper.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./akode/lib/volumefilter.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./akode/lib/volumefilter.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./akode/lib/volumefilter.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./akode/lib/volumefilter.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./akode/lib/converter.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./akode/lib/converter.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/libwm/audio/audio_arts.c.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/libwm/audio/audio_arts.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/libwm/include/wm_cdda.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/libwm/include/wm_cdda.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/libwm/cdda.c.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/libwm/cdda.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/libwm/plat_sun.c.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/libwm/plat_sun.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/libwm/plat_sun_cdda.c.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/libwm/plat_sun_cdda.c
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/libwm/cddaslave.c.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/libwm/cddaslave.c
***********************************
46d45
< #include "include/wm_cdrom.h"
50,58d48
< #define WMCDDA_ACK WM_CDM_CDDAACK
< #define WMCDDA_PLAYING WM_CDM_PLAYING
< #define WMCDDA_PAUSED WM_CDM_PAUSED
< #define WMCDDA_STOPPED WM_CDM_STOPPED
< #define WMCDDA_DONE WM_CDM_TRACK_DONE
< 
< #define NUMBLOCKS 2
< #define NUMFRAMES 10
<  
453,457d442
< static int get_next_block(int x)
< {
<     int y = ++x;
<     return (y < NUMBLOCKS ? y : 0);
< }
459d443
< 
520c504
<     ERRORLOG("cddaslave: setup_soundsystem failed\n", "");
---
>     ERRORLOG("cddaslave: setup_soundsystem failed\n");
531d514
<   int i = 0;
561,567c544,547
<     if ((blockinfo.status & ~WMCDDA_ACK) == WMCDDA_PLAYING)
<     {
<       // result = wmcdda_read(&dev, &blockinfo);
<       result = wmcdda_read(&dev, &dev.blocks[i]);
<       if (result <= 0 && blockinfo.status != WMCDDA_DONE)
<       {
<         ERRORLOG("cddaslave: wmcdda_read failed\n", "");
---
>     if ((blockinfo.status & ~WMCDDA_ACK) == WMCDDA_PLAYING) {
>       result = wmcdda_read(&dev, &blockinfo);
>       if (result <= 0 && blockinfo.status != WMCDDA_DONE) {
>         ERRORLOG("cddaslave: wmcdda_read failed\n");
569,575c549,551
< 	send_status(&dev.blocks[i]);
< 	// send_status(&blockinfo);
<       }
<       else
<       {
<         result = wmcdda_normalize(&dev, &dev.blocks[i]);
<         // result = wmcdda_normalize(&dev, &blockinfo);
---
> 	send_status(&blockinfo);
>       } else {
>         result = wmcdda_normalize(&dev, &blockinfo);
577,581c553
< 	{
<           fwrite(dev.blocks[i].buf, dev.blocks[i].buflen, 1, output);
< 	  i = get_next_block(i);
<           // fwrite(dev.blocks[i].buf, result, 1, output);
< 	}
---
>           fwrite(dev.buf, result, 1, output);
583,584c555
<         if (oops->wmaudio_play(&dev.blocks[i]))
< 	{
---
>         if (oops->wmaudio_play(dev.buf, dev.buflen, &blockinfo)) {
586c557
<           ERRORLOG("cddaslave: wmaudio_play failed\n", "");
---
>           ERRORLOG("cddaslave: wmaudio_play failed\n");
591,592c562
<     }
<     else
---
>     } else
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kscd/kscd.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kscd/kscd.cpp
***********************************
1229a1230,1231
>         connect(cddialog,SIGNAL(newCDInfoStored(KCDDB::CDInfo)),
>             SLOT(setCDInfo(KCDDB::CDInfo)));
1326a1329,1339
>     setCDInfo(info);
>   
>     // In case the cddb dialog is open, update it
>     if (cddialog)
>       cddialog->setData(cddbInfo, trackStartFrames, playlist);
> 
>     led_off();
> } // lookupCDDBDone
> 
> void KSCD::setCDInfo(KCDDB::CDInfo info)
> {
1338a1352
> }
1340,1346d1353
<     // In case the cddb dialog is open, update it
<     if (cddialog)
<       cddialog->setData(cddbInfo, trackStartFrames, playlist);
< 
<     led_off();
< } // lookupCDDBDone
< 
1352c1359
<   cddbInfo.id = QString::number(cddb_discid(), 16);
---
>   cddbInfo.id = QString::number(cddb_discid(), 16).rightJustify(8,'0');
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/stringhash.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/stringhash.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/actioncollection.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/actioncollection.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/actioncollection.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/actioncollection.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/historyplaylist.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/historyplaylist.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/playlist.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/playlist.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/historyplaylist.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/historyplaylist.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./juk/tagrenameroptions.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./juk/tagrenameroptions.cpp
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./mpeglib_artsplug/decoderBaseObject_impl.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./mpeglib_artsplug/decoderBaseObject_impl.h
***********************************
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kmix/mixer_sun.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kmix/mixer_sun.h
***********************************
28c28,30
< class Mixer_SUN : public Mixer
---
> #include "mixer_backend.h"
> 
> class Mixer_SUN : public Mixer_Backend
31,33c33,34
<   Mixer_SUN();
<   Mixer_SUN(int devnum, int SetNum);
<   virtual ~Mixer_SUN() {};
---
>   Mixer_SUN(int devnum);
>   virtual ~Mixer_SUN();
42,43c43,44
<   virtual int openMixer();
<   virtual int releaseMixer();
---
>   virtual int open();
>   virtual int close();
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kmix/kmix-platforms.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kmix/kmix-platforms.cpp
***********************************
26a27,30
> #include <qstring.h>
> 
> #include "mixer_backend.h"
> 
91,92c95
< typedef Mixer *getMixerFunc( int device, int card );
< typedef Mixer *getMixerSetFunc( MixSet set, int device, int card );
---
> typedef Mixer_Backend *getMixerFunc( int device );
97d99
<     getMixerSetFunc *getMixerSet;
104c106
<     { NAS_getMixer, 0 , 0 },
---
>     { NAS_getMixer, 0 },
108c110
<     { SUN_getMixer, 0 , SUN_getDriverName },
---
>     { SUN_getMixer, SUN_getDriverName },
112c114
<     { IRIX_getMixer, 0 , IRIX_getDriverName },
---
>     { IRIX_getMixer, IRIX_getDriverName },
116c118
<     { ALSA_getMixer, 0, ALSA_getDriverName },
---
>     { ALSA_getMixer, ALSA_getDriverName },
120c122
<     { OSS_getMixer, 0 , OSS_getDriverName },
---
>     { OSS_getMixer, OSS_getDriverName },
124c126
<     { HPUX_getMixer, 0, HPUX_getDriverName },
---
>     { HPUX_getMixer, HPUX_getDriverName },
127c129
<     { 0, 0, 0 }
---
>     { 0, 0 }
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./kmix/mixer_sun.cpp.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./kmix/mixer_sun.cpp
***********************************
116c116
< Mixer* SUN_getMixer( int devnum, int SetNum )
---
> Mixer_Backend* SUN_getMixer( int devnum )
118,119c118,119
<    Mixer *l_mixer;
<    l_mixer = new Mixer_SUN( devnum, SetNum );
---
>    Mixer_Backend *l_mixer;
>    l_mixer = new Mixer_SUN( devnum );
122a123
> 
124,125c125,126
< // FUNCTION    : SUN_getMixerSet
< // DESCRIPTION : Creates and returns a new mixer object.
---
> // FUNCTION    : Mixer::Mixer
> // DESCRIPTION : Class constructor.
127,128c128
< /*
< Mixer* SUN_getMixerSet( MixSet set, int device, int card )
---
> Mixer_SUN::Mixer_SUN(int devnum) : Mixer_Backend(devnum)
130,132c130,131
<    Mixer *l_mixer;
<    l_mixer = new Mixer_SUN( device, card );
<    return l_mixer;
---
>    if ( devnum == -1 )
>       m_devnum = 0;
134d132
< */
138c136
< // DESCRIPTION : Class constructor.
---
> // DESCRIPTION : Class destructor.
140c138
< Mixer_SUN::Mixer_SUN(int devnum, int card) : Mixer(devnum, card)
---
> Mixer_SUN::~Mixer_SUN(int devnum) : Mixer_Backend(devnum)
142,145c140
<    if ( devnum == -1 )
<       m_devnum = 0;
<    if ( card == -1 )
<       m_cardnum = 0;
---
>    close();
149c144
< // FUNCTION    : Mixer::openMixer
---
> // FUNCTION    : Mixer::open
152c147
< int Mixer_SUN::openMixer()
---
> int Mixer_SUN::open()
155c150
<    // We don't support multiple cards or devices
---
>    // We don't support multiple devices
157,158d151
<    if ( m_cardnum != 0 )
<       return Mixer::ERR_OPEN;
163,167d155
<    // Release mixer before (re-)opening
<    //
<    release();
< 
<    //
205c193
<               return ERR_INCOMPATIBLESET;
---
>               return Mixer::ERR_INCOMPATIBLESET;
218c206
< // FUNCTION    : Mixer::releaseMixer
---
> // FUNCTION    : Mixer::close
221c209
< int Mixer_SUN::releaseMixer()
---
> int Mixer_SUN::close()
222a211
>    m_isOpen = false;
223a213
>    m_mixDevices.clear();
236c226
<       case ERR_PERM:
---
>       case Mixer::ERR_PERM:
243c233
<          errmsg = Mixer::errorText( mixer_error );
---
>          errmsg = Mixer_Backend::errorText( mixer_error );
***********************************
Processing diff /src/steleman/kde-3.4.1/kdemultimedia-3.4.1/./xine_artsplugin/xinePlayObject_impl.h.kde.orig /src/steleman/kde-3.4.2/kdemultimedia-3.4.2/./xine_artsplugin/xinePlayObject_impl.h
***********************************
***********************************
