summaryrefslogtreecommitdiff
authoralwin <alwin>2005-04-09 21:37:02 (UTC)
committer alwin <alwin>2005-04-09 21:37:02 (UTC)
commit274690da3f91a808b77a7b9bf98b6bc09a302fc9 (patch) (side-by-side diff)
tree7f87991f04a8ad41f2178871f75ba1c2466217c8
parentaf5f26910ae74bd5446db73fd9c870d4aad94f52 (diff)
downloadopie-274690da3f91a808b77a7b9bf98b6bc09a302fc9.zip
opie-274690da3f91a808b77a7b9bf98b6bc09a302fc9.tar.gz
opie-274690da3f91a808b77a7b9bf98b6bc09a302fc9.tar.bz2
cleanup audio/videooutput the right way
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 6ed4cea..9f0d448 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -133,48 +133,50 @@ void Lib::initialize()
m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput );
xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
if (m_wid != 0 )
setWidget( m_wid );
m_queue = xine_event_new_queue (m_stream);
xine_event_create_listener_thread (m_queue, xine_event_handler, this);
::null_preload_decoders( m_stream );
m_duringInitialization = false;
}
Lib::~Lib() {
assert( isRunning() == false );
assert( m_initialized );
// free( m_config );
xine_close( m_stream );
xine_event_dispose_queue( m_queue );
xine_dispose( m_stream );
+ xine_close_audio_driver(m_xine,m_audioOutput);
+ xine_close_video_driver(m_xine,m_videoOutput);
xine_exit( m_xine );
/* FIXME either free or delete but valgrind bitches against both */
//free( m_videoOutput );
//delete m_audioOutput;
}
void Lib::resize ( const QSize &s ) {
assert( m_initialized || m_duringInitialization );
if ( s. width ( ) && s. height ( ) ) {
::null_set_gui_width( m_videoOutput, s. width() );
::null_set_gui_height( m_videoOutput, s. height() );
}
}
int Lib::majorVersion() {
int major, minor, sub;
xine_get_version ( &major, &minor, &sub );
return major;
}
int Lib::minorVersion() {
int major, minor, sub;