[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-multimedia
Subject: [PATCH] cout IV
From: Martin Vogt <mvogt () rhrk ! uni-kl ! de>
Date: 2000-10-01 15:43:55
[Download RAW message or body]
Hope this is the last.
Martin
["a.patch" (text/plain)]
? a.patch
Index: decoderBaseObject_impl.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/decoderBaseObject_impl.cpp,v
retrieving revision 1.13
diff -u -r1.13 decoderBaseObject_impl.cpp
--- decoderBaseObject_impl.cpp 2000/09/07 16:49:28 1.13
+++ decoderBaseObject_impl.cpp 2000/10/01 15:40:55
@@ -27,7 +27,6 @@
outputStream=NULL;
#else
outputStream=new ArtsOutputStream(NULL);
- cout << "outputStream created"<<endl;
decoderPlugin=NULL;
#endif
startTime=0.0;
@@ -39,16 +38,13 @@
}
DecoderBaseObject_impl::~DecoderBaseObject_impl() {
- cout << "~DecoderBaseObject_impl -s"<<endl;
shudownPlugins();
if (decoderPlugin != NULL) {
- cout << "delete decoderPlugin"<<endl;
delete decoderPlugin;
decoderPlugin=NULL;
}
if (outputStream != NULL) {
- cout << "delete outputStream"<<endl;
delete outputStream;
outputStream=NULL;
}
@@ -115,7 +111,6 @@
string DecoderBaseObject_impl::description() {
- cout << "description"<<endl;
string back;
#ifdef _STRIP_ZERO
return back;
@@ -158,7 +153,6 @@
}
poCapabilities DecoderBaseObject_impl::capabilities() {
- cout << "capabilities"<<endl;
#ifdef _STRIP_ZERO
return capSeek;
#endif
@@ -172,7 +166,6 @@
}
string DecoderBaseObject_impl::mediaName() {
- cout << "mediaName"<<endl;
string back;
// whats a mediaName?
return back;
@@ -183,7 +176,6 @@
}
void DecoderBaseObject_impl::play() {
- cout << "play:" << streamState<<endl;
if (streamState == _THREADSTATE_OPENED) {
decoderPlugin->play();
} else {
@@ -201,8 +193,6 @@
long sec=seekTime.seconds;
- cout << "sec in plugin is:"<<sec<<endl;
-
// we send an async command
Command cmd(_COMMAND_SEEK,sec);
decoderPlugin->insertAsyncCommand(&cmd);
@@ -214,13 +204,12 @@
// thread blocking allowed
outputStream->audioOpen();
- cout << "************ reopen"<<endl;
+
// now set a new startTime
startTime=sec;
}
void DecoderBaseObject_impl::pause() {
- cout << "pause" << endl;
_state = posPaused;
Command cmd(_COMMAND_PAUSE);
decoderPlugin->insertAsyncCommand(&cmd);
@@ -235,7 +224,6 @@
*
*/
- cout << "halt"<<endl;
_state=posIdle;
shudownPlugins();
}
@@ -343,7 +331,6 @@
int lenough=false;
if (audioState & _STREAM_MASK_IS_EOF) {
if(_state == posPlaying) {
- cout << "eof got in arts********** END"<<endl;
_state = posIdle;
}
Index: mp3PlayObject_impl.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/mp3PlayObject_impl.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mp3PlayObject_impl.cpp
--- mp3PlayObject_impl.cpp 2000/07/04 19:37:00 1.1.1.1
+++ mp3PlayObject_impl.cpp 2000/10/01 15:40:55
@@ -16,18 +16,15 @@
MP3PlayObject_impl::MP3PlayObject_impl() {
- cout << "MP3PlayObject_impl -s" << endl;
- cout << "MP3PlayObject_impl -e" << endl;
}
MP3PlayObject_impl::~MP3PlayObject_impl() {
- cout << "~MP3PlayObject_impl" << endl;
+
}
DecoderPlugin* MP3PlayObject_impl::createPlugin() {
- cout << "MP3PlayObject_impl::getPlugin"<<endl;
return new SplayPlugin();
}
Index: mpgPlayObject_impl.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/mpgPlayObject_impl.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mpgPlayObject_impl.cpp
--- mpgPlayObject_impl.cpp 2000/07/04 19:37:00 1.1.1.1
+++ mpgPlayObject_impl.cpp 2000/10/01 15:40:55
@@ -18,13 +18,10 @@
MPGPlayObject_impl::MPGPlayObject_impl() {
- cout << "MPGPlayObject_impl -s" << endl;
- cout << "MPGPlayObject_impl -e" << endl;
-
}
MPGPlayObject_impl::~MPGPlayObject_impl() {
- cout << "~MPGPlayObject_impl" << endl;
+
}
Index: oggPlayObject_impl.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/oggPlayObject_impl.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 oggPlayObject_impl.cpp
--- oggPlayObject_impl.cpp 2000/07/04 19:37:00 1.1.1.1
+++ oggPlayObject_impl.cpp 2000/10/01 15:40:55
@@ -19,19 +19,16 @@
OGGPlayObject_impl::OGGPlayObject_impl() {
- cout << "OGGPlayObject_impl -s" << endl;
-
- cout << "OGGPlayObject_impl -e" << endl;
}
OGGPlayObject_impl::~OGGPlayObject_impl() {
- cout << "~OGGPlayObject_impl" << endl;
+
}
DecoderPlugin* OGGPlayObject_impl::createPlugin() {
- cout << "OGGPlayObject_impl::getPlugin"<<endl;
+
DecoderPlugin* vorbisPlugin;
// load vorbis lib dynamic
void *handle = dlopen ("libvorbis_kmpg.so", RTLD_LAZY);
@@ -45,7 +42,6 @@
char* error;
if (handle) {
- cout << "getVorbisPlayer start"<<endl;
DecoderPlugin* (*getPlugin)()=
(DecoderPlugin *(*)())dlsym(handle,"getVorbisPlayer");
// ^^^^^^^^^^^^^^^^^^^^^
@@ -56,7 +52,6 @@
fputs(error, stderr);
vorbisPlugin=new DecoderPlugin();
} else {
- cout << "we have vorbis!"<<endl;
vorbisPlugin=(*getPlugin)();
}
} else {
Index: wavPlayObject_impl.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/mpeglib_artsplug/wavPlayObject_impl.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 wavPlayObject_impl.cpp
--- wavPlayObject_impl.cpp 2000/07/04 19:37:00 1.1.1.1
+++ wavPlayObject_impl.cpp 2000/10/01 15:40:55
@@ -16,18 +16,13 @@
WAVPlayObject_impl::WAVPlayObject_impl() {
- cout << "WAVPlayObject_impl -s" << endl;
- cout << "WAVPlayObject_impl -e" << endl;
-
}
WAVPlayObject_impl::~WAVPlayObject_impl() {
- cout << "~WAVPlayObject_impl" << endl;
}
DecoderPlugin* WAVPlayObject_impl::createPlugin() {
- cout << "WAVPlayObject_impl::getPlugin"<<endl;
return new TplayPlugin();
}
_______________________________________________
Kde-multimedia mailing list
Kde-multimedia@master.kde.org
http://master.kde.org/mailman/listinfo/kde-multimedia
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic