summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-08 20:27:19 (UTC)
committer simon <simon>2002-12-08 20:27:19 (UTC)
commitec91b042d8312f83027beb357448fe02a13e8923 (patch) (unidiff)
treec61b89e7fc7f22bb1dfaa19f2597c5bdae903572
parentce313e53a56591fd883348f5e265606865fdcb50 (diff)
downloadopie-ec91b042d8312f83027beb357448fe02a13e8923.zip
opie-ec91b042d8312f83027beb357448fe02a13e8923.tar.gz
opie-ec91b042d8312f83027beb357448fe02a13e8923.tar.bz2
- properly shut down xine in the destructor. fixes crashes when switching
skins
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 4a96408..1b5fd51 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -107,32 +107,39 @@ Lib::Lib( XineVideoWidget* widget ) {
107 107
108 if (m_wid != 0 ) { 108 if (m_wid != 0 ) {
109 printf( "!0\n" ); 109 printf( "!0\n" );
110 resize ( m_wid-> size ( ) ); 110 resize ( m_wid-> size ( ) );
111 ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); 111 ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
112 112
113 m_wid->repaint(); 113 m_wid->repaint();
114 } 114 }
115 115
116 m_queue = xine_event_new_queue (m_stream); 116 m_queue = xine_event_new_queue (m_stream);
117 117
118 xine_event_create_listener_thread (m_queue, xine_event_handler, this); 118 xine_event_create_listener_thread (m_queue, xine_event_handler, this);
119} 119}
120 120
121Lib::~Lib() { 121Lib::~Lib() {
122// free( m_config ); 122// free( m_config );
123
124 xine_close( m_stream );
125
126 xine_event_dispose_queue( m_queue );
127
128 xine_dispose( m_stream );
129
123 xine_exit( m_xine ); 130 xine_exit( m_xine );
124 /* FIXME either free or delete but valgrind bitches against both */ 131 /* FIXME either free or delete but valgrind bitches against both */
125 //free( m_videoOutput ); 132 //free( m_videoOutput );
126 //delete m_audioOutput; 133 //delete m_audioOutput;
127} 134}
128 135
129void Lib::resize ( const QSize &s ) { 136void Lib::resize ( const QSize &s ) {
130 if ( s. width ( ) && s. height ( ) ) { 137 if ( s. width ( ) && s. height ( ) ) {
131 ::null_set_gui_width( m_videoOutput, s. width() ); 138 ::null_set_gui_width( m_videoOutput, s. width() );
132 ::null_set_gui_height( m_videoOutput, s. height() ); 139 ::null_set_gui_height( m_videoOutput, s. height() );
133 } 140 }
134} 141}
135 142
136int Lib::majorVersion() { 143int Lib::majorVersion() {
137 int major, minor, sub; 144 int major, minor, sub;
138 xine_get_version ( &major, &minor, &sub ); 145 xine_get_version ( &major, &minor, &sub );