This patch is for package: kdemultimedia-3.0.3
	Main purpose is updating the kde sources for mips-sgi-irix
	Comments mhertha@hartmann-hertha.de



*** kdemultimedia-3.0.3/arts/gui/kde/kgraph.cpp	Tue Aug 27 11:44:33 2002
--- kdemultimedia-3.0.3/arts/gui/kde/kgraph.cpp.ORG	Tue Aug 27 11:34:09 2002
***************
*** 126,136 ****
  				int dx = e->x() - p.x();
  				int dy = e->y() - p.y();
  
! #ifdef __sgi
! 				if(sqrt(float(dx*dx + dy*dy)) < 5.0)
! #else
! 				if(::sqrt((dx*dx + dy*dy) < 5.0)
! #endif
  				{
  					selectedIndex = index;
  					selectedLine = gline;
--- 126,132 ----
  				int dx = e->x() - p.x();
  				int dy = e->y() - p.y();
  
! 				if(::sqrt(dx*dx + dy*dy) < 5.0)
  				{
  					selectedIndex = index;
  					selectedLine = gline;








*** kdemultimedia-3.0.3/arts/modules/synth_play_pat_impl.cc	Tue Aug 27 11:51:12 2002
--- kdemultimedia-3.0.3/arts/modules/synth_play_pat_impl.cc.ORG	Tue Aug 27 11:52:06 2002
***************
*** 439,449 ****
  			list<CachedPat::Data*>::iterator i;
  			for(i = pat->dList.begin(); i != pat->dList.end(); i++)
  			{
- #if __sgi
- 				int diff = abs(float(ifreq - (*i)->patch.origFreq));
- #else
  				int diff = ::abs(ifreq - (*i)->patch.origFreq);
- #endif
  				if(diff < bestdiff)
  				{
  					selected = *i;
--- 439,445 ----




*** kdemultimedia-3.0.3/arts/modules/synth_freeverb_impl.cc	Tue Aug 27 11:55:07 2002
--- kdemultimedia-3.0.3/arts/modules/synth_freeverb_impl.cc.ORG	Tue Aug 27 11:46:39 2002
***************
*** 31,56 ****
  {
  	revmodel *model;
  public:
- #ifdef __sgi
  	float	roomsize()				{ return model->getroomsize(); }
- 	void	roomsize(float newval)	{ model->setroomsize(newval); }
- 
- 	float	damp()					{ return model->getdamp(); }
- 	void	damp(float newval)		{ model->setdamp(newval); }
- 
- 	float	wet()					{ return model->getwet(); }
- 	void	wet(float newval)		{ model->setwet(newval); }
- 
- 	float	dry()					{ return model->getdry(); }
- 	void	dry(float newval)		{ model->setdry(newval); }
- 
- 	float	width()					{ return model->getwidth(); }
- 	void	width(float newval)		{ model->setwidth(newval); }
- 
- 	float	mode()					{ return model->getmode(); }
- 	void	mode(float newval)		{ model->setmode(newval); }
- #else
- 	float	roomsize()				{ return model->getroomsize(); }
  	void	roomsize(float newval)	{ return model->setroomsize(newval); }
  
  	float	damp()					{ return model->getdamp(); }
--- 31,37 ----
***************
*** 67,74 ****
  
  	float	mode()					{ return model->getmode(); }
  	void	mode(float newval)		{ return model->setmode(newval); }
- #endif
- 
  
  	void streamInit()
  	{
--- 48,53 ----




*** kdemultimedia-3.0.3/arts/builder/structure.cpp	Tue Aug 27 12:07:09 2002
--- kdemultimedia-3.0.3/arts/builder/structure.cpp.ORG	Tue Aug 27 12:06:45 2002
***************
*** 23,33 ****
  #include "soundserver.h"
  #include "kartsserver.h"
  #include <stdio.h>
- #ifdef __sgi
- #include <iostream>
- #else
  #include <iostream.h>
- #endif
  #include <fstream>
  #include <arts/debug.h>
  
--- 23,29 ----




*** kdemultimedia-3.0.3/arts/runtime/artsbuilderloader_impl.cc	Tue Aug 27 11:21:29 2002
--- kdemultimedia-3.0.3/arts/runtime/artsbuilderloader_impl.cc.ORG	Tue Aug 27 11:21:46 2002
***************
*** 22,32 ****
  
  #include "artsbuilder.h"
  #include "debug.h"
- #ifdef __sgi
- #include <fstream>
- #else
  #include <fstream.h>
- #endif
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <stdio.h>
--- 22,28 ----




*** kdemultimedia-3.0.3/kmid/kmid_part.cpp	Tue Aug 27 12:37:04 2002
--- kdemultimedia-3.0.3/kmid/kmid_part.cpp.ORG	Tue Aug 27 12:36:52 2002
***************
*** 12,19 ****
  #include "kmidclient.h"
  #include <qtimer.h>
  
- using namespace KParts;
- 
  extern "C"
  {
    /**
--- 12,17 ----




*** kdemultimedia-3.0.3/kmix/mixer_irix.h	Tue Aug 27 16:04:04 2002
--- kdemultimedia-3.0.3/kmix/mixer_irix.h.ORG	Tue Aug 27 13:53:33 2002
***************
*** 1,42 ****
- /*
-  *              KMix -- KDE's full featured mini mixer
-  *
-  *
-  *              Copyright (C) ?
-  *                            2002 Maik Hertha <maik.hertha@berlin.de>
-  *                       
-  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
  #ifndef MIXER_IRIX_H
  #define MIXER_IRIX_H
  
  #include <dmedia/audio.h>
  
  class Mixer_IRIX : public Mixer
  {
  public:
    Mixer_IRIX(int devnum, int SetNum);
    virtual ~Mixer_IRIX() {};
  
!   virtual int readVolumeFromHW( int devnum, Volume& volume );
!   virtual int writeVolumeToHW( int devnum, Volume volume );
  
  protected:
!   virtual bool setRecsrcHW( int devnum, bool on = true );
!   virtual bool isRecsrcHW( int devnum );
    virtual int openMixer();
    virtual int releaseMixer();
  
--- 1,22 ----
  #ifndef MIXER_IRIX_H
  #define MIXER_IRIX_H
  
+ #define _LANGUAGE_C_PLUS_PLUS
  #include <dmedia/audio.h>
  
  class Mixer_IRIX : public Mixer
  {
  public:
+   Mixer_IRIX();
    Mixer_IRIX(int devnum, int SetNum);
    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 openMixer();
    virtual int releaseMixer();
  




*** kdemultimedia-3.0.3/kscd/libwm/plat_irix.c	Tue Aug 27 16:53:49 2002
--- kdemultimedia-3.0.3/kscd/libwm/plat_irix.c.ORG	Tue Aug 27 16:53:43 2002
***************
*** 63,69 ****
  
  #include "include/wm_struct.h"
  #include "include/wm_cdtext.h"
! #include "include/wm_helpers.h"
  #define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
  
  void *malloc();
--- 63,69 ----
  
  #include "include/wm_struct.h"
  #include "include/wm_cdtext.h"
! 
  #define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
  
  void *malloc();




*** kdemultimedia-3.0.3/kmidi/TIMIDITY/timidity.c	Tue Aug 27 12:54:57 2002
--- kdemultimedia-3.0.3/kmidi/TIMIDITY/timidity.c.ORG	Tue Aug 27 12:40:05 2002
***************
*** 21,31 ****
  #include <stdio.h>
  #include <stdlib.h>
  
- #ifdef __sgi
- #include <strings.h>
- #else
  #include <string.h>
- #endif
  
  #if defined(__linux__) || defined(__FreeBSD__) || defined(__bsdi__)
  #ifndef AU_LINUX
--- 21,27 ----
***************
*** 464,470 ****
  #endif
  
  
!   if ( (program_name=rindex(argv[0], '/')) ) program_name++;
    else program_name=argv[0];
  #ifndef KMIDI
    if (argc==1)
--- 460,466 ----
  #endif
  
  
!   if ((program_name=rindex(argv[0], '/'))) program_name++;
    else program_name=argv[0];
  #ifndef KMIDI
    if (argc==1)




*** kdemultimedia-3.0.3/aktion/aktion_part.cpp	Tue Aug 27 10:02:53 2002
--- kdemultimedia-3.0.3/aktion/aktion_part.cpp.ORG	Tue Aug 27 10:02:31 2002
***************
*** 18,24 ****
  */
  
  #include "aktion_part.h"
- using namespace KParts;
  
  #include <klocale.h>
  #include <kiconloader.h>
--- 18,23 ----




*** kdemultimedia-3.0.3/noatun/library/app.cpp	Tue Aug 27 14:47:04 2002
--- kdemultimedia-3.0.3/noatun/library/app.cpp.ORG	Tue Aug 27 14:47:01 2002
***************
*** 236,246 ****
  {
  	KConfig *c=KGlobal::config();
  	c->setGroup("");
- #ifdef __sgi
- 	c->writeEntry("TitleFormat", format);
- #else
  	return c->writeEntry("TitleFormat", format);
- #endif
  }
  
  void NoatunApp::setClearOnOpen(bool b)
--- 236,242 ----




*** kdemultimedia-3.0.3/noatun/library/noatun/playlist.h	Tue Aug 27 14:43:23 2002
--- kdemultimedia-3.0.3/noatun/library/noatun/playlist.h.ORG	Tue Aug 27 14:43:20 2002
***************
*** 5,15 ****
  #include <kurl.h>
  #include <qdict.h>
  #include <qstringlist.h>
- #ifdef __sgi
- #include <assert.h>
- #else
  #include <cassert>
- #endif
  
  class PlaylistItem;
  
--- 5,11 ----




*** kdemultimedia-3.0.3/noatun/modules/voiceprint/voiceprint.cpp	Tue Aug 27 15:03:28 2002
--- kdemultimedia-3.0.3/noatun/modules/voiceprint/voiceprint.cpp.ORG	Tue Aug 27 15:03:25 2002
***************
*** 93,99 ****
  	for (int i=0; i<bands ; i++)
  	{
  		float b=data[bands-i-1]+1.0;
! 		b=log10(b)/log(2.)*255.0*16;
  		int band=(int)b;
  		if (band>255) band=255;
  		else if (band<0) band=0;
--- 93,99 ----
  	for (int i=0; i<bands ; i++)
  	{
  		float b=data[bands-i-1]+1.0;
! 		b=log10(b)/log(2)*255.0*16;
  		int band=(int)b;
  		if (band>255) band=255;
  		else if (band<0) band=0;




*** kdemultimedia-3.0.3/noatun/modules/winskin/vis/winSkinFFT_impl.cpp	Tue Aug 27 15:08:01 2002
--- kdemultimedia-3.0.3/noatun/modules/winskin/vis/winSkinFFT_impl.cpp.ORG	Tue Aug 27 15:07:56 2002
***************
*** 96,106 ****
      tmp=re*re+im*im;  
      // Here I check a new idea. We remove all low values
      // and all values over xyz to xyz.
! #ifdef __sgi
!     fftArray[pos]=(int)(::sqrt(::sqrt(float(tmp))));
! #else
!     fftArray[pos]=(int)(::sqrt(::sqrt(tmp))));
! #endif    
      if (fftArray[pos]<=15) {
        max+=fftArray[pos];
      } else {
--- 96,103 ----
      tmp=re*re+im*im;  
      // Here I check a new idea. We remove all low values
      // and all values over xyz to xyz.
!     fftArray[pos]=(int)(::sqrt(::sqrt(tmp)));
!     
      if (fftArray[pos]<=15) {
        max+=fftArray[pos];
      } else {




*** kdemultimedia-3.0.3/noatun/modules/winskin/waColor.cpp	Tue Aug 27 15:19:52 2002
--- kdemultimedia-3.0.3/noatun/modules/winskin/waColor.cpp.ORG	Tue Aug 27 15:19:49 2002
***************
*** 1,8 ****
- #ifdef __sgi
- #include <fstream>
- #else
  #include <fstream.h>
- #endif
  #include <qfile.h>
  
  #include "waColor.h"
--- 1,4 ----




*** kdemultimedia-3.0.3/kaboodle/userinterface.cpp	Tue Aug 27 12:33:02 2002
--- kdemultimedia-3.0.3/kaboodle/userinterface.cpp.ORG	Tue Aug 27 12:32:54 2002
***************
*** 43,50 ****
  #include "userinterface.h"
  #include <kstatusbar.h>
  
- using namespace KParts;
- 
  UserInterface::UserInterface(QWidget *parent, const KURL &initialFile)
  	: KParts::MainWindow(parent)
  {
--- 43,48 ----




*** kdemultimedia-3.0.3/kaboodle/kaboodle_factory.cpp	Tue Aug 27 12:18:19 2002
--- kdemultimedia-3.0.3/kaboodle/kaboodle_factory.cpp.ORG	Tue Aug 27 12:18:09 2002
***************
*** 23,30 ****
  
  #include <klocale.h>
  
- using namespace KParts;
- 
  #include "kaboodle_part.h"
  #include "kaboodle_factory.moc"
  
--- 23,28 ----