-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 5 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 040eab3..cef46a1 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -70,12 +70,13 @@ extern "C" { | |||
70 | 70 | ||
71 | using namespace XINE; | 71 | using namespace XINE; |
72 | 72 | ||
73 | Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) | 73 | Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) |
74 | { | 74 | { |
75 | m_initialized = false; | 75 | m_initialized = false; |
76 | m_duringInitialization = false; | ||
76 | m_video = false; | 77 | m_video = false; |
77 | m_wid = widget; | 78 | m_wid = widget; |
78 | printf("Lib"); | 79 | printf("Lib"); |
79 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; | 80 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
80 | // get the configuration | 81 | // get the configuration |
81 | 82 | ||
@@ -100,12 +101,13 @@ void Lib::run() | |||
100 | { | 101 | { |
101 | assert( false ); | 102 | assert( false ); |
102 | } | 103 | } |
103 | 104 | ||
104 | void Lib::initialize() | 105 | void Lib::initialize() |
105 | { | 106 | { |
107 | m_duringInitialization = true; | ||
106 | m_xine = xine_new( ); | 108 | m_xine = xine_new( ); |
107 | 109 | ||
108 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; | 110 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
109 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); | 111 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); |
110 | 112 | ||
111 | xine_init( m_xine ); | 113 | xine_init( m_xine ); |
@@ -131,12 +133,13 @@ void Lib::initialize() | |||
131 | // m_wid->repaint(); | 133 | // m_wid->repaint(); |
132 | } | 134 | } |
133 | 135 | ||
134 | m_queue = xine_event_new_queue (m_stream); | 136 | m_queue = xine_event_new_queue (m_stream); |
135 | 137 | ||
136 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 138 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
139 | m_duringInitialization = false; | ||
137 | } | 140 | } |
138 | 141 | ||
139 | Lib::~Lib() { | 142 | Lib::~Lib() { |
140 | assert( isRunning() == false ); | 143 | assert( isRunning() == false ); |
141 | assert( m_initialized ); | 144 | assert( m_initialized ); |
142 | 145 | ||
@@ -152,13 +155,13 @@ Lib::~Lib() { | |||
152 | /* FIXME either free or delete but valgrind bitches against both */ | 155 | /* FIXME either free or delete but valgrind bitches against both */ |
153 | //free( m_videoOutput ); | 156 | //free( m_videoOutput ); |
154 | //delete m_audioOutput; | 157 | //delete m_audioOutput; |
155 | } | 158 | } |
156 | 159 | ||
157 | void Lib::resize ( const QSize &s ) { | 160 | void Lib::resize ( const QSize &s ) { |
158 | assert( m_initialized ); | 161 | assert( m_initialized || m_duringInitialization ); |
159 | 162 | ||
160 | if ( s. width ( ) && s. height ( ) ) { | 163 | if ( s. width ( ) && s. height ( ) ) { |
161 | ::null_set_gui_width( m_videoOutput, s. width() ); | 164 | ::null_set_gui_width( m_videoOutput, s. width() ); |
162 | ::null_set_gui_height( m_videoOutput, s. height() ); | 165 | ::null_set_gui_height( m_videoOutput, s. height() ); |
163 | } | 166 | } |
164 | } | 167 | } |
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 7e3a912..9dd7385 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -190,12 +190,13 @@ namespace XINE { | |||
190 | 190 | ||
191 | private: | 191 | private: |
192 | void initialize(); | 192 | void initialize(); |
193 | 193 | ||
194 | int m_bytes_per_pixel; | 194 | int m_bytes_per_pixel; |
195 | bool m_initialized:1; | 195 | bool m_initialized:1; |
196 | bool m_duringInitialization:1; | ||
196 | bool m_video:1; | 197 | bool m_video:1; |
197 | XineVideoWidget *m_wid; | 198 | XineVideoWidget *m_wid; |
198 | xine_t *m_xine; | 199 | xine_t *m_xine; |
199 | xine_stream_t *m_stream; | 200 | xine_stream_t *m_stream; |
200 | xine_cfg_entry_t *m_config; | 201 | xine_cfg_entry_t *m_config; |
201 | xine_vo_driver_t *m_videoOutput; | 202 | xine_vo_driver_t *m_videoOutput; |