From kde-multimedia  Fri Sep 29 15:38:37 2000
From: Martin Vogt <mvogt () rhrk ! uni-kl ! de>
Date: Fri, 29 Sep 2000 15:38:37 +0000
To: kde-multimedia
Subject: [PATCH] cout
X-MARC-Message: https://marc.info/?l=kde-multimedia&m=97024186106923
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--huq684BweRXVnRxX"


--huq684BweRXVnRxX
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline


Hi,


this patch removes couts/printfs.

Martin

  

--huq684BweRXVnRxX
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="a.patch"

? a.patch
? example/yaf/yafyuv/yaf-yuv
Index: lib/decoder/decoderPlugin.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/decoder/decoderPlugin.cpp,v
retrieving revision 1.5
diff -u -r1.5 decoderPlugin.cpp
--- lib/decoder/decoderPlugin.cpp	2000/08/30 20:23:32	1.5
+++ lib/decoder/decoderPlugin.cpp	2000/09/29 15:31:06
@@ -64,26 +64,16 @@
 DecoderPlugin::~DecoderPlugin(){
   void* ret;
   lCreatorLoop=false;
-  cout << "~DecoderPlugin 1"<<endl;
   Command cmd(_COMMAND_CLOSE);
-  cout << "~DecoderPlugin 2"<<endl;
   insertAsyncCommand(&cmd);
 
-
-  cout << "~DecoderPlugin 3"<<endl;
-
   abs_thread_join(tr,&ret);
-  cout << "~DecoderPlugin 4"<<endl;
 
   abs_thread_cond_destroy(&streamStateCond);
   abs_thread_mutex_destroy(&streamStateMut);
   abs_thread_mutex_destroy(&shutdownMut);
   
-  cout << "~DecoderPlugin 5"<<endl;
-
   delete commandPipe;
-  cout << "~DecoderPlugin 6"<<endl;
-
   delete threadCommand;
   delete pluginInfo;
 }
@@ -93,18 +83,14 @@
   // from here we can only walk to init or eof
   // in both cases we sometimes catch out decoderMut :-)
   Command cmd(_COMMAND_CLOSE);
-  cout << "send async close"<<endl;
   insertAsyncCommand(&cmd);
   shutdownLock();
   if (input != NULL) {
     input->close();
   }
   shutdownUnlock();
-  cout << "DecoderPlugin::close"<<endl;
   insertSyncCommand(&cmd);
-  cout <<"wait for shudown -s"<<endl;
   waitForStreamState(_STREAM_STATE_EOF);
-  cout <<"wait for shudown -e"<<endl;
   input=NULL;
 }
 
@@ -194,9 +180,7 @@
     cout << "input is NULL"<<endl;
     exit(0);
   }
-  cout << "setUrl -s"<<endl;
   pluginInfo->setUrl(input->getUrl());
-  cout << "setUrl -e"<<endl;
 
 
   // the command is synchron we block until the
@@ -224,10 +208,8 @@
   if (strcmp(key,"-y")==0) {
     if (strcmp(value,"on")==0) {
       lAutoPlay=true;
-      cout << "******** autoplay on"<<endl;
     } else {
       lAutoPlay=false;
-      cout << "******** autoplay off"<<endl;
     }
   }
   
@@ -290,7 +272,6 @@
     }
     
 
-    cout << "thread lDecoderLoop"<<endl;
     if (lDecoderLoop) {
       setStreamState(_STREAM_STATE_FIRST_INIT);
       linDecoderLoop=false;
@@ -316,7 +297,6 @@
 
 int DecoderPlugin::runCheck() {
   if (runCheck_Counter==0) {
-    cout << "DecoderPlugin::shutdownUnlock"<<instance<<endl;
     shutdownUnlock();
   }
   runCheck_Counter++;
@@ -326,7 +306,6 @@
     // a shutdown of the decode_loop thread
     // it has more priority than the resyn request
     if (input->eof()) {
-      cout << "we have eof going wait for end"<<endl;
       setStreamState(_STREAM_STATE_WAIT_FOR_END);
     }  
     //
@@ -366,9 +345,7 @@
 
   }
 
-  cout << "DecoderPlugin::shutdownlock -s"<<instance<<endl;
   shutdownLock();
-  cout << "DecoderPlugin::shutdownlock -e"<<instance<<endl;
   return false;
 }
 
@@ -389,7 +366,6 @@
       input->clear();
       break; 
     case _COMMAND_CLOSE:
-      cout << "_COMMAND_CLOSE in RESYNC_COMMIT";
       //
       // we return false so that the plugin clears
       // all its allocated classes
@@ -410,11 +386,9 @@
   case _COMMAND_PING:
     break;
   case _COMMAND_PAUSE:
-    cout << "_COMMAND_PAUSE";
     lDecode=false;
     break;
   case _COMMAND_PLAY:
-    cout << "_COMMAND_PLAY";
     lDecode=true;
     break;
   case _COMMAND_SEEK: {
@@ -422,13 +396,11 @@
       command->print("ignore command seek in _STREAM_STATE_FIRST_INIT");
     } else {
       intArg=command->getIntArg();
-      cout << "_COMMAND_SEEK:"<<intArg<<endl;
       seek_impl(intArg);
     }
     break;
   }
   case _COMMAND_CLOSE:
-    cout << "_COMMAND_CLOSE";
     //
     // we return false so that the plugin clears
     // all its allocated classes
@@ -436,7 +408,6 @@
     // in the next call we exit immediately
     return _RUN_CHECK_FALSE;
   case _COMMAND_RESYNC_START:
-    cout << "_COMMAND_RESYNC_START"<<endl;
     setStreamState(_STREAM_STATE_RESYNC_COMMIT);
     input->clear();
     break;
Index: lib/mpegplay/copyFunctions.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpegplay/copyFunctions.cpp,v
retrieving revision 1.2
diff -u -r1.2 copyFunctions.cpp
--- lib/mpegplay/copyFunctions.cpp	2000/08/16 16:31:55	1.2
+++ lib/mpegplay/copyFunctions.cpp	2000/09/29 15:31:07
@@ -65,13 +65,7 @@
 
   
 #ifdef INTEL
-  cout << "check mm support for copyFunctions"<<endl;
   lmmx=mm_support();
-  if (lmmx) {
-    cout << "Jau! Intel MMX in copy"<<endl;
-  } else {
-    cout << "Sorry folks, no MMX. in copy"<<endl;
-  }
 #else
   lmmx=false;
   cout << "no INTEL arch- disable MMX in copyFunctions"<<endl;
Index: lib/mpegplay/decoderClass.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpegplay/decoderClass.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 decoderClass.cpp
--- lib/mpegplay/decoderClass.cpp	2000/07/04 19:22:33	1.1.1.1
+++ lib/mpegplay/decoderClass.cpp	2000/09/29 15:31:07
@@ -91,13 +91,7 @@
 
 
 #ifdef INTEL
-  cout << "check mm support"<<endl;
   lmmx=mm_support();
-  if (lmmx) {
-    cout << "Jau! Intel MMX"<<endl;
-  } else {
-    cout << "Sorry folks, no MMX."<<endl;
-  }
 #else
   lmmx=false;
   cout << "no INTEL arch- disable MMX in decoderClass"<<endl;
Index: lib/mpegplay/macroBlock.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpegplay/macroBlock.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 macroBlock.cpp
--- lib/mpegplay/macroBlock.cpp	2000/07/04 19:22:38	1.1.1.1
+++ lib/mpegplay/macroBlock.cpp	2000/09/29 15:31:08
@@ -22,7 +22,6 @@
 
 
 MacroBlock::~MacroBlock() {
-  cout << "delete copyFunctions"<<endl;
   delete copyFunctions;
 }
 
Index: lib/mpegplay/mpegPlugin.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpegplay/mpegPlugin.cpp,v
retrieving revision 1.2
diff -u -r1.2 mpegPlugin.cpp
--- lib/mpegplay/mpegPlugin.cpp	2000/07/17 15:40:07	1.2
+++ lib/mpegplay/mpegPlugin.cpp	2000/09/29 15:31:08
@@ -37,7 +37,6 @@
 
 
   VideoDecoder* video=NULL;
-  cout << "MpegPlugin::decoder_loop() 1"<<endl;
   if (input == NULL) {
     cout << "MpegPlugin::decoder_loop input is NULL"<<endl;
     exit(0);
@@ -60,15 +59,12 @@
       if (mpegVideoStream->firstInitialize(mpegVideoHeader)==false) {
 
       } else {
-	cout << "mpegPlugin firstInitialize (has)"<<endl;
 	pluginInfo->setLength(getSongLength());
 	
 	// now create pictureArray from the sequence
 	int width=mpegVideoHeader->getMB_Width()*16;
 	int height=mpegVideoHeader->getMB_Height()*16;
-	cout << "width:"<<width<<" height:"<<height<<endl;
 
-
 	output->openWindow(width,height,(char*)"kmpg");
 	video=new VideoDecoder(mpegVideoStream,mpegVideoHeader);
 	setStreamState(_STREAM_STATE_INIT);
@@ -109,23 +105,18 @@
     case _STREAM_STATE_WAIT_FOR_END:
       // exit while loop
       lDecoderLoop=false;
-      cout << "mpegplugin _STREAM_STATE_WAIT_FOR_END"<<endl;
       break;
     default:
       cout << "unknown stream state:"<<streamState<<endl;
     }
   }
 
-  cout << "*********mpegPLugin exit"<<endl;
-
   output->flushWindow();
   // copy sequence back if needed
   if (video != NULL) {
     delete video;
   }
-  cout << "delete mpegVideoStream"<<endl;
   delete mpegVideoStream;
-  cout << "delete mpegVideoHeader;"<<endl;
   delete mpegVideoHeader;
   mpegVideoStream=NULL;
   mpegVideoHeader=NULL;
Index: lib/mpegplay/mpegVideoLength.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpegplay/mpegVideoLength.cpp,v
retrieving revision 1.3
diff -u -r1.3 mpegVideoLength.cpp
--- lib/mpegplay/mpegVideoLength.cpp	2000/07/17 15:40:07	1.3
+++ lib/mpegplay/mpegVideoLength.cpp	2000/09/29 15:31:08
@@ -93,7 +93,6 @@
 
 	// if non system, reset everything and work on raw stream
 	if (mpegSystemHeader->getLayer() == _PACKET_SYSLAYER) {
-	  cout << "syslayer"<<endl;
 	  lSysLayer=true;
 	}
 	if (lSysLayer == false) {
@@ -109,7 +108,6 @@
     }
     if (lHasRawStream == false) {
       if (mpegVideoStream->firstInitialize(mpegVideoHeader) == true) {
-	cout << "HAS stream"<<endl;
 	lHasRawStream=true;
       }
       return false;
@@ -411,20 +409,16 @@
   // now put it into the gop structure 
   // this is the interface for the time.
   // a little hack here and there....
-  cout << "currentPTS:"<<currentPTS<<endl;
   unsigned int hour=((long)currentPTS) / 3600;
   currentPTS=currentPTS-hour*3600;
-  cout << "currentPTS:"<<currentPTS<<endl;
   unsigned int minute=((long)currentPTS) / 60;
   currentPTS=currentPTS-minute*60;
-  cout << "currentPTS:"<<currentPTS<<endl;
   unsigned int seconds=((long)currentPTS);
 
 
   dest->setHour(hour);
   dest->setMinute(minute);
   dest->setSecond(seconds);
-  dest->print("gop");
   return true;
 }
 
Index: lib/mpegplay/videoDecoder.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpegplay/videoDecoder.cpp,v
retrieving revision 1.3
diff -u -r1.3 videoDecoder.cpp
--- lib/mpegplay/videoDecoder.cpp	2000/08/06 18:55:20	1.3
+++ lib/mpegplay/videoDecoder.cpp	2000/09/29 15:31:08
@@ -49,22 +49,14 @@
 
 VideoDecoder::~VideoDecoder() {
 
-  cout << "pictureArray -s"<<endl;
-
   delete mpegVideoHeader;
   delete picture;
-  cout << "decoderClass"<<endl;
   delete decoderClass;
-  cout << "recon"<<endl;
   delete recon;
-  cout << "motionVector"<<endl;
   delete motionVector;
-  cout << "slice"<<endl;
   delete slice;
-  cout << "~video"<<endl;
   delete group;
   delete extension;
-  cout << "delete macroBlock"<<endl;
   delete macroBlock;
 }
 
@@ -151,7 +143,6 @@
  
     break;
   case USER_START_CODE:
-    cout << "found USER_START_CODE"<<endl;
     mpegVideoStream->flushBits(32);
     /* Goto next start code. */
     mpegVideoStream->next_start_code();
@@ -334,7 +325,6 @@
 
 void VideoDecoder::resyncToI_Frame() {
 
-  cout << "resyncToI_Frame"<<endl;
   syncState=SYNC_TO_CLOSED_GOP;
 }
 
@@ -462,7 +452,6 @@
     return;
   }
   if (syncState < SYNC_HAS_FRAME_SYNC) {
-    cout << "discarding B frame"<<endl;
     return;
   }
 
Index: lib/mpgplayer/mpegStreamPlayer.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpgplayer/mpegStreamPlayer.cpp,v
retrieving revision 1.5
diff -u -r1.5 mpegStreamPlayer.cpp
--- lib/mpgplayer/mpegStreamPlayer.cpp	2000/08/31 13:47:30	1.5
+++ lib/mpgplayer/mpegStreamPlayer.cpp	2000/09/29 15:31:08
@@ -88,17 +88,12 @@
   // everything is prepared for future shutdown
   // restart any waiting decoders
   // (they exit immediately)
-  cout << "~MpegStreamPlayer *********************"<<endl;
   audioDecoder->close();
   videoDecoder->close();
-  cout << "audioDecoder wait for eof"<<endl;
   audioDecoder->waitForStreamState(_STREAM_STATE_EOF);
-  cout << "videoDecoder wait for eof"<<endl;
   videoDecoder->waitForStreamState(_STREAM_STATE_EOF);
   
-  cout << "~videoInput"<<endl;
   delete videoInput;
-  cout << "~audioInput"<<endl;
   delete audioInput;
   delete nukeBuffer;
   delete timeStampVideo;
@@ -124,19 +119,13 @@
   // and restart them
 
   if (seekPos != -1) {
-    cout << "seekPos != -1"<<endl;
     int audioDecoderState=audioDecoder->getStreamState();
     int videoDecoderState=videoDecoder->getStreamState();
     if  (audioDecoderState == _STREAM_STATE_RESYNC_COMMIT) {
-      cout << "audio resync"<<endl;
       if (videoDecoderState == _STREAM_STATE_RESYNC_COMMIT)  {
-	cout << "video resync"<<endl;
 	Command restart(_COMMAND_RESYNC_END);
-	cout << "seek -s"<<endl;
 	input->seek(seekPos);
-	cout << "seek -e"<<endl;
 	seekPos=-1;
-	cout << "*************** insert end"<<endl;
 	audioDecoder->insertSyncCommand(&restart);
 	videoDecoder->insertSyncCommand(&restart);
 	Command play(_COMMAND_PLAY);
@@ -242,7 +231,6 @@
    a clean shutdown for a seek request.
 */
 void MpegStreamPlayer::processThreadCommand(Command* command) {
-  command->print("read");
   
   int id=command->getID();
 
Index: lib/mpgplayer/mpgPlugin.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/mpgplayer/mpgPlugin.cpp,v
retrieving revision 1.3
diff -u -r1.3 mpgPlugin.cpp
--- lib/mpgplayer/mpgPlugin.cpp	2000/07/17 15:40:07	1.3
+++ lib/mpgplayer/mpgPlugin.cpp	2000/09/29 15:31:08
@@ -83,7 +83,6 @@
     switch(streamState) {
     case _STREAM_STATE_FIRST_INIT :
       if ((lHasLength==false) && (lDoLength)) {
-	//cout << "doing legnth"<<endl;
 	if (mpegVideoLength->firstInitialize()==false) {
 	  continue;
 	}
@@ -95,7 +94,6 @@
 	  
 	// if we have found a raw stream,
 	// make sure we pass as first argument a SEQ_START_CODE
-	cout << "***************"<<endl;
 	if (mpegSystemHeader->getLayer() == _PACKET_SYSLAYER) {
 	  lSysLayer=true;
 	  mpegStreamPlayer->processSystemHeader(mpegSystemHeader);
@@ -108,7 +106,6 @@
 	pluginInfo->setLength(mpegVideoLength->getLength());
 	output->writeInfo(pluginInfo);
 	setStreamState(_STREAM_STATE_INIT);
-	cout << "setStreamState(_STREAM_STATE_INIT);"<<endl;
 	
 	if (mpegSystemHeader->getMPEG2()==true) {
 	  cout << "this plugin does not support MPEG2/VOB/DVD"<<endl;
@@ -145,7 +142,6 @@
     }
   }
 
-  cout << "***********************mpgPlugin leave"<<endl;
   delete mpegStreamPlayer;
   delete mpegSystemStream;
   delete mpegVideoLength;
@@ -160,7 +156,6 @@
   output->audioFlush();
   output->flushWindow();
 
-  cout << "leave"<<endl;
 }
 
 
@@ -169,13 +164,11 @@
 void MpgPlugin::config(const char* key,const char* value,void* user_data) {
   if(strcmp("VideoLayer", key) == 0) {
     int videoLayerSelect=atoi(value);
-    cout << "setVideoLayerSelect:"<<videoLayerSelect<<endl;
     mpegSystemHeader->setVideoLayerSelect(videoLayerSelect);
   }
 
   if(strcmp("AudioLayer", key) == 0) {
     int audioLayerSelect=atoi(value);
-    cout << "setAudioLayerSelect:"<<audioLayerSelect<<endl;
     mpegSystemHeader->setAudioLayerSelect(audioLayerSelect);
   }
   if (strcmp(key,"-2")==0) {
@@ -234,7 +227,6 @@
     //
     // mapping from second to bytePosition
     //
-    cout << "************ SEEEEEEEEEEEEEEEEK ************"<<endl;
     if (mpegStreamPlayer->isInit()==false) {
       command->print("MPGPLUGIN:ignore command in _STREAM_STATE_FIRST_INIT");
     } else {
Index: lib/output/artsOutputStream.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/output/artsOutputStream.cpp,v
retrieving revision 1.5
diff -u -r1.5 artsOutputStream.cpp
--- lib/output/artsOutputStream.cpp	2000/08/30 20:23:32	1.5
+++ lib/output/artsOutputStream.cpp	2000/09/29 15:31:08
@@ -20,9 +20,7 @@
 
 ArtsOutputStream::ArtsOutputStream(void (*streamStateChangeCallback)(void*)) {
   
-  cout << "audioTime"<<endl;
   audioTime=new AudioTime();
-  cout << "x11Window"<<endl;
   x11Window=new WindowOut();
   privateBufferSize=1024*32;
 
@@ -32,9 +30,7 @@
   // Arts must pass the total size of the audiobuffer
   // from /dev/dsp + connected nodes
   // or arts need a video interface
-  cout << "buffer"<<endl;
   stream=new BufferInputStream(privateBufferSize,1024*64,"artsLoopback");
-  cout << "AVSyncer"<<endl;
   avSyncer=new AVSyncer(privateBufferSize);
 
   // we set it, but its never used !
@@ -43,15 +39,10 @@
 
 
 ArtsOutputStream::~ArtsOutputStream() {
-  cout << "~stream"<<endl;
   delete stream;
-  cout << "~audioTime"<<endl;
   delete audioTime;
-  cout << "~x11Window"<<endl;
   delete x11Window;
-  cout << "~avSyncer"<<endl;
   delete avSyncer;
-  cout << "~ArtsOutputStream end"<<endl;
 }
 
 
Index: lib/output/audioTime.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/output/audioTime.cpp,v
retrieving revision 1.3
diff -u -r1.3 audioTime.cpp
--- lib/output/audioTime.cpp	2000/07/27 15:24:55	1.3
+++ lib/output/audioTime.cpp	2000/09/29 15:31:09
@@ -117,7 +117,6 @@
   float timeLength=calculateTime(size);
   time.tv_sec=(time_t)timeLength;
   time.tv_usec=(time_t)(1000000*(timeLength-time.tv_sec));
-  cout << "tv_sec:"<<time.tv_sec<<" tv_usec:"<<time.tv_usec<<endl;
   select(0,NULL,NULL,NULL,&time);
 
 }
Index: lib/output/dspX11OutputStream.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/output/dspX11OutputStream.cpp,v
retrieving revision 1.4
diff -u -r1.4 dspX11OutputStream.cpp
--- lib/output/dspX11OutputStream.cpp	2000/08/08 16:21:28	1.4
+++ lib/output/dspX11OutputStream.cpp	2000/09/29 15:31:09
@@ -83,7 +83,6 @@
   
 
   if (lneedInit) {
-    cout << "lneedInit is true ********"<<endl;
     audioWrapper->init(audioTime->getSampleSize(),
 		       audioTime->getSpeed(),
 		       audioTime->getStereo());   
Index: lib/output/outputStream.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/output/outputStream.cpp,v
retrieving revision 1.3
diff -u -r1.3 outputStream.cpp
--- lib/output/outputStream.cpp	2000/08/29 16:10:32	1.3
+++ lib/output/outputStream.cpp	2000/09/29 15:31:09
@@ -23,7 +23,6 @@
   // afer the call we never execute the asm part again
   // and everything is fine
   mm_support();
-  cout << "OutputStream behind mm_support"<<endl;
   abs_thread_mutex_init(&stateChangeMut);
   abs_thread_cond_init(&stateChangeCond);
 
Index: lib/splay/splayPlugin.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/splay/splayPlugin.cpp,v
retrieving revision 1.5
diff -u -r1.5 splayPlugin.cpp
--- lib/splay/splayPlugin.cpp	2000/08/30 20:23:32	1.5
+++ lib/splay/splayPlugin.cpp	2000/09/29 15:31:09
@@ -73,16 +73,12 @@
   int len=0;
   int resyncCounter=0;
   // start decoding
-  cout << "splay start **************************"<<endl;
-
   while(runCheck()) {
     
     switch(streamState) {
     case _STREAM_STATE_FIRST_INIT :
-      cout << "_STREAM_STATE_FIRST_INIT"<<endl;
       if (mpegAudioStream->firstInitialize(currentHeader)==false) {
       } else {
-	cout << "splay has init"<<endl;
 	server = new Mpegtoraw(mpegAudioStream,currentHeader,output);
 	server->setdownfrequency(downSampleFlag);
 	server->setforcetomono(monoFlag);
@@ -92,7 +88,6 @@
 	setStreamState(_STREAM_STATE_PLAY);
 	if (lnoLength==false) {
 	  len=mpegAudioStream->getLength();
-	  cout << "length in splay:"<<len<<endl;
 	  pluginInfo->setLength(len);
 	  output->writeInfo(pluginInfo);
 	}
@@ -127,14 +122,12 @@
       break;
     case _STREAM_STATE_WAIT_FOR_END:
       // exit while loop
-      cout << "splay _STREAM_STATE_WAIT_FOR_END"<<endl;
       lDecoderLoop=false;
       break;
     default:
       cout << "unknown stream state:"<<streamState<<endl;
     }
   }
-  cout << "splay exit ****"<<endl;
   // remove decoder
   if (server != NULL) {
     server->clearbuffer();
@@ -152,7 +145,6 @@
 int SplayPlugin::seek_impl(int second) {
 
 
-  cout << "SplayPlugin::seek -1"<<endl;
   if (mpegAudioStream != NULL) {
     int pos=mpegAudioStream->getSeekPosition(second);
     input->seek(pos);
@@ -160,7 +152,6 @@
   } else {
     cout << "cannot seek, plugin not initialized"<<endl;
   }
-  cout << "SplayPlugin::seek -3"<<endl;
   return true;
 }
 
Index: lib/util/render/pictureArray.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/util/render/pictureArray.cpp,v
retrieving revision 1.3
diff -u -r1.3 pictureArray.cpp
--- lib/util/render/pictureArray.cpp	2000/08/06 18:55:20	1.3
+++ lib/util/render/pictureArray.cpp	2000/09/29 15:31:09
@@ -41,14 +41,8 @@
 
 PictureArray::~PictureArray() {
   int i;
-  cout << "~PictureArray"<<endl;
   for (i=0;i<_PICTURE_ARRAY_SIZE;i++) {
-    printf("i:%d ptr:%p\n",i,pictureArray[i]);
-  }
-  for (i=0;i<_PICTURE_ARRAY_SIZE;i++) {
-    cout << "i:"<<i<<endl;
     if (pictureArray[i] != NULL) {
-      cout << "deleted"<<endl;
       delete pictureArray[i];
       pictureArray[i]=NULL;
     }
Index: lib/util/render/dither/ditherWrapper.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/util/render/dither/ditherWrapper.cpp,v
retrieving revision 1.4
diff -u -r1.4 ditherWrapper.cpp
--- lib/util/render/dither/ditherWrapper.cpp	2000/08/09 19:55:55	1.4
+++ lib/util/render/dither/ditherWrapper.cpp	2000/09/29 15:31:09
@@ -48,19 +48,10 @@
   ditherRGB=new DitherRGB();
  
   
-  cout << "dither end"<<endl;
 #ifdef INTEL
-  cout << "check mm support for dither"<<endl;
   lmmx=mm_support();
-  if (lmmx) {
-    cout << "Jau! Intel MMX in dither"<<endl;
-  } else {
-    cout << "Sorry folks, no MMX. in dither"<<endl;
-  }
-  
 #else
   lmmx=false;
-  cout << "no INTEL arch- disable MMX in dither"<<endl;
 #endif
 
 
Index: lib/util/render/x11/imageXVDesk.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/util/render/x11/imageXVDesk.cpp,v
retrieving revision 1.5
diff -u -r1.5 imageXVDesk.cpp
--- lib/util/render/x11/imageXVDesk.cpp	2000/08/06 18:55:20	1.5
+++ lib/util/render/x11/imageXVDesk.cpp	2000/09/29 15:31:10
@@ -170,50 +170,51 @@
   unsigned int		p_num_adaptors=0;
 
   /**------------------------------- XV ------------------------------------*/
-  printf("beginning to parse the Xvideo extension...\n\n");
   
   /** query and print Xvideo properties */
 
   ret = XvQueryExtension(xWindow->display, 
 			 &p_version, &p_release, &p_request_base,
 			 &p_event_base, &p_error_base);
-  cout << "XvQueryExtension -e"<<endl;
   if (ret != Success) {
     if (ret == XvBadExtension)
-      printf("XvBadExtension returned at XvQueryExtension.\n");
+      //printf("XvBadExtension returned at XvQueryExtension.\n");
     else
       if (ret == XvBadAlloc)
-	printf("XvBadAlloc returned at XvQueryExtension.\n");
+	//printf("XvBadAlloc returned at XvQueryExtension.\n");
       else
-	printf("other error happened at XvQueryExtension.\n");
+	//printf("other error happened at XvQueryExtension.\n");
     return false;
   }
-  printf("========================================\n");
-  printf("XvQueryExtension returned the following:\n");
-  printf("p_version      : %u\n", p_version);
-  printf("p_release      : %u\n", p_release);
-  printf("p_request_base : %u\n", p_request_base);
-  printf("p_event_base   : %u\n", p_event_base);
-  printf("p_error_base   : %u\n", p_error_base);
-  printf("========================================\n");
+  /*
+    printf("========================================\n");
+    printf("XvQueryExtension returned the following:\n");
+    printf("p_version      : %u\n", p_version);
+    printf("p_release      : %u\n", p_release);
+    printf("p_request_base : %u\n", p_request_base);
+    printf("p_event_base   : %u\n", p_event_base);
+    printf("p_error_base   : %u\n", p_error_base);
+    printf("========================================\n");
+  */
   
   ret = XvQueryAdaptors(xWindow->display, DefaultRootWindow(xWindow->display),
 			&p_num_adaptors, &ai);
   
   if (ret != Success) {
     if (ret == XvBadExtension)
-      printf("XvBadExtension returned at XvQueryExtension.\n");
+      //printf("XvBadExtension returned at XvQueryExtension.\n");
     else
       if (ret == XvBadAlloc)
-	printf("XvBadAlloc returned at XvQueryExtension.\n");
+	//printf("XvBadAlloc returned at XvQueryExtension.\n");
       else
-	printf("other error happaned at XvQueryAdaptors.\n");
+	//printf("other error happaned at XvQueryAdaptors.\n");
     return false;
   }
+  /*
   printf("=======================================\n");
   printf("XvQueryAdaptors returned the following:\n");
   printf("%d adaptors available.\n", p_num_adaptors);
-
+  */
   if (p_num_adaptors == 0) {
     cout << "no adaptors found. XV not possible"<<endl;
     return false;
@@ -223,25 +224,29 @@
   unsigned int j;
 
   for (i = 0; i < p_num_adaptors; i++) {
-    printf(" name:        %s\n"
-	   " type:        %s%s%s%s%s\n"
-	   " ports:       %ld\n"
-	   " first port:  %ld\n",
-	   ai[i].name,
-	   (ai[i].type & XvInputMask)	? "input | "	: "",
-	   (ai[i].type & XvOutputMask)	? "output | "	: "",
-	   (ai[i].type & XvVideoMask)	? "video | "	: "",
-	   (ai[i].type & XvStillMask)	? "still | "	: "",
-	   (ai[i].type & XvImageMask)	? "image | "	: "",
-	   ai[i].num_ports,
-	   ai[i].base_id);
+    /*
+      printf(" name:        %s\n"
+      " type:        %s%s%s%s%s\n"
+      " ports:       %ld\n"
+      " first port:  %ld\n",
+      ai[i].name,
+      (ai[i].type & XvInputMask)	? "input | "	: "",
+      (ai[i].type & XvOutputMask)	? "output | "	: "",
+      (ai[i].type & XvVideoMask)	? "video | "	: "",
+      (ai[i].type & XvStillMask)	? "still | "	: "",
+      (ai[i].type & XvImageMask)	? "image | "	: "",
+      ai[i].num_ports,
+      ai[i].base_id);
+    */
     xv_port = ai[i].base_id;
     
-    printf("adaptor %d ; format list:\n", i);
+    //printf("adaptor %d ; format list:\n", i);
     for (j = 0; j < ai[i].num_formats; j++) {
-      printf(" depth=%d, visual=%ld\n",
-	     ai[i].formats[j].depth,
-	     ai[i].formats[j].visual_id);
+      /*
+	printf(" depth=%d, visual=%ld\n",
+	ai[i].formats[j].depth,
+	ai[i].formats[j].visual_id);
+      */
     }
     unsigned int p;
     unsigned int encodings;
@@ -250,21 +255,24 @@
 
     for (p = ai[i].base_id; p < ai[i].base_id+ai[i].num_ports; p++) {
       
-      printf(" encoding list for port %d\n", p);
+      //printf(" encoding list for port %d\n", p);
       if (XvQueryEncodings(xWindow->display, p, &encodings, &ei) != Success) {
-	printf("XvQueryEncodings failed.\n");
+	//printf("XvQueryEncodings failed.\n");
 	continue;
       }
       for (j = 0; j < encodings; j++) {
+	/*
 	printf("  id=%ld, name=%s, size=%ldx%ld, numerator=%d, denominator=%d\n",
 	       ei[j].encoding_id, ei[j].name, ei[j].width, ei[j].height,
 	       ei[j].rate.numerator, ei[j].rate.denominator);
+	*/
       }
       XvFreeEncodingInfo(ei);
       int k;
-      printf(" attribute list for port %d\n", p);
+      //printf(" attribute list for port %d\n", p);
       at = XvQueryPortAttributes(xWindow->display, p, &attributes);
       for (k = 0; k < attributes; k++) {
+	/*
 	printf("  name:       %s\n"
 	       "  flags:     %s%s\n"
 	       "  min_color:  %i\n"
@@ -273,17 +281,20 @@
 	       (at[k].flags & XvGettable) ? " get" : "",
 	       (at[k].flags & XvSettable) ? " set" : "",						
 	       at[k].min_value, at[k].max_value);
+	*/
       }
       if (at)
 	XFree(at);
       
-      printf(" image format list for port %d\n", p);
+      //printf(" image format list for port %d\n", p);
       fo = XvListImageFormats(xWindow->display, p, &formats);
       for (k = 0; k < formats; k++) {
+	/*
 	printf("  0x%x (%4.4s) %s\n",
 	       fo[k].id,
 	       (char *)&fo[k].id,
 	       (fo[k].format == XvPacked) ? "packed" : "planar");
+	*/
       }
       if (fo)
 	XFree(fo);
Index: lib/util/render/x11/x11Surface.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib/lib/util/render/x11/x11Surface.cpp,v
retrieving revision 1.8
diff -u -r1.8 x11Surface.cpp
--- lib/util/render/x11/x11Surface.cpp	2000/09/05 22:06:10	1.8
+++ lib/util/render/x11/x11Surface.cpp	2000/09/29 15:31:10
@@ -62,7 +62,6 @@
 
 
 X11Surface::~X11Surface() {
-  cout << "~X11Surface"<<endl;
   close();
   XCloseDisplay(xWindow->display);
   delete xWindow;
@@ -148,7 +147,7 @@
   xWindow->gc=XCreateGC(xWindow->display,xWindow->window,0,NULL);
   XMapRaised(xWindow->display,xWindow->window);
   XFlush(xWindow->display);
-  cout << "init display"<<endl;
+
   if (xWindow->depth >= 16) {
     initColorDisplay(xWindow);
 
@@ -173,15 +172,12 @@
   imageDeskXV=new ImageXVDesk(xWindow);
 
 
-  cout << "end x11open"<<endl;
-
   return true;
 }
 
 
 int X11Surface::close() {
   if (isOpen()==false) {
-    cout << "WindowOut::closeWindow already closed"<<endl;
     return true;
   }
   closeImage();
@@ -205,7 +201,6 @@
     cout << "bad open error X11Surface::openImage"<<endl;
     exit(0);
   }
-  cout << "************* openImage:"<<lXVAllow<<endl;
   this->imageMode=imageMode;
   imageCurrent=NULL;
   this->imageSize=imageSize;
@@ -282,9 +277,7 @@
   
   if (XCheckTypedWindowEvent(xWindow->display,
 			     xWindow->window,ButtonPress,&event)) {
-    cout << "event!"<<endl;
     if (event.xbutton.button == Button1) {
-      cout << "Button1"<<endl;
       if (imageSize==_SIZE_NORMAL) {
 	*newSize=_SIZE_DOUBLE;
       } else {
@@ -293,7 +286,6 @@
 	
     }
     if (event.xbutton.button == Button3) {
-      cout << "Button2"<<endl;
       if (imageMode== _IMAGE_DESK) {
 	if (imageFullDGA->support()==false) {
 	  return false;
@@ -316,7 +308,6 @@
 			const char* value, void* ) {
   if (strcmp(key,"xvAllow")==0) {
     lXVAllow=atoi(value);
-    cout << "setting lXVAllow:"<<lXVAllow<<endl;
   } 
 }
  

--huq684BweRXVnRxX--
_______________________________________________
Kde-multimedia mailing list
Kde-multimedia@master.kde.org
http://master.kde.org/mailman/listinfo/kde-multimedia