summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-06-07 14:24:25 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2018-06-07 14:24:25 (GMT)
commitde908386bae765e5717a5c7b804f35dbe6a44605 (patch)
tree31dd9fcf2da364dbc2c90952af84682197dc3760
parent0ff78fd8fa394a48fbc458c0e1b860f144163cca (diff)
downloadtdemultimedia-de908386.zip
tdemultimedia-de908386.tar.gz
Fixed NukePlugin implementation which was preventing the sound server
from autosuspending. This relates to bug 2844. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--mpeglib/lib/decoder/nukePlugin.cpp14
-rw-r--r--mpeglib/lib/decoder/nukePlugin.h4
2 files changed, 9 insertions, 9 deletions
diff --git a/mpeglib/lib/decoder/nukePlugin.cpp b/mpeglib/lib/decoder/nukePlugin.cpp
index 08c8ce8..e75796c 100644
--- a/mpeglib/lib/decoder/nukePlugin.cpp
+++ b/mpeglib/lib/decoder/nukePlugin.cpp
@@ -1,5 +1,5 @@
/*
- this plugin nukes the input data.
+ This plugin nukes the input data and does not play any sound.
Copyright (C) 2000 Martin Vogt
This program is free software; you can redistribute it and/or modify
@@ -12,7 +12,6 @@
#include "nukePlugin.h"
-
#include <iostream>
using namespace std;
@@ -20,12 +19,9 @@ using namespace std;
NukePlugin::NukePlugin() {
}
-
NukePlugin::~NukePlugin() {
}
-
-
void NukePlugin::decoder_loop() {
if (input == NULL) {
cout << "NukePlugin::decoder_loop input is NULL"<<endl;
@@ -37,10 +33,14 @@ void NukePlugin::decoder_loop() {
}
char nukeBuffer[8192];
+ output->audioInit();
while(runCheck()) {
-
switch(streamState) {
case _STREAM_STATE_FIRST_INIT :
+ output->audioOpen();
+ output->audioSetup(0,0,0,0,0);
+ setStreamState(_STREAM_STATE_PLAY);
+ break;
case _STREAM_STATE_INIT :
case _STREAM_STATE_PLAY :
input->read(nukeBuffer,8192);
@@ -54,6 +54,8 @@ void NukePlugin::decoder_loop() {
cout << "unknown stream state:"<<streamState<<endl;
}
}
+ output->audioFlush();
+ output->audioClose();
}
diff --git a/mpeglib/lib/decoder/nukePlugin.h b/mpeglib/lib/decoder/nukePlugin.h
index 8a9aa9a..a7df249 100644
--- a/mpeglib/lib/decoder/nukePlugin.h
+++ b/mpeglib/lib/decoder/nukePlugin.h
@@ -1,5 +1,5 @@
/*
- this plugin nukes the input data.
+ This plugin nukes the input data and does not play any sound.
Copyright (C) 2000 Martin Vogt
This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,5 @@ class KDE_EXPORT NukePlugin : public DecoderPlugin {
void decoder_loop();
void config(const char* key,const char* value,void* user_data);
- private:
-
};
#endif