author | simon <simon> | 2002-12-10 22:27:04 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-10 22:27:04 (UTC) |
commit | 0ee7b9eb000d0ca5dfeab074e45488d0bc44314b (patch) (unidiff) | |
tree | b10a90cc3a9eb5566bfa9219634f35954447dd68 | |
parent | 34418795f4bef0466fc92aa9dfd8f25210bc2bc5 (diff) | |
download | opie-0ee7b9eb000d0ca5dfeab074e45488d0bc44314b.zip opie-0ee7b9eb000d0ca5dfeab074e45488d0bc44314b.tar.gz opie-0ee7b9eb000d0ca5dfeab074e45488d0bc44314b.tar.bz2 |
- factor out the expensive xine initialization code into a separate method,
as preparation
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 17 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 9e818eb..641cbca 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -37,8 +37,9 @@ | |||
37 | #include <qtextstream.h> | 37 | #include <qtextstream.h> |
38 | #include <qpe/resource.h> | 38 | #include <qpe/resource.h> |
39 | 39 | ||
40 | #include <qfile.h> | 40 | #include <qfile.h> |
41 | #include <qdir.h> | ||
41 | 42 | ||
42 | #include <qgfx_qws.h> | 43 | #include <qgfx_qws.h> |
43 | #include <qdirectpainter_qws.h> | 44 | #include <qdirectpainter_qws.h> |
44 | 45 | ||
@@ -72,24 +73,29 @@ using namespace XINE; | |||
72 | Lib::Lib( XineVideoWidget* widget ) { | 73 | Lib::Lib( XineVideoWidget* widget ) { |
73 | m_video = false; | 74 | m_video = false; |
74 | m_wid = widget; | 75 | m_wid = widget; |
75 | printf("Lib"); | 76 | printf("Lib"); |
76 | QCString str( getenv("HOME") ); | 77 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
77 | str += "/Settings/opiexine.cf"; | ||
78 | // get the configuration | 78 | // get the configuration |
79 | 79 | ||
80 | // not really OO, should be an extra class, later | 80 | // not really OO, should be an extra class, later |
81 | if ( !QFile(str).exists() ) { | 81 | if ( !QFile::exists(configPath) ) { |
82 | QFile f(str); | 82 | QFile f(configPath); |
83 | f.open(IO_WriteOnly); | 83 | f.open(IO_WriteOnly); |
84 | QTextStream ts( &f ); | 84 | QTextStream ts( &f ); |
85 | ts << "misc.memcpy_method:glibc\n"; | 85 | ts << "misc.memcpy_method:glibc\n"; |
86 | f.close(); | 86 | f.close(); |
87 | } | 87 | } |
88 | 88 | ||
89 | initialize(); | ||
90 | } | ||
91 | |||
92 | void Lib::initialize() | ||
93 | { | ||
89 | m_xine = xine_new( ); | 94 | m_xine = xine_new( ); |
90 | 95 | ||
91 | xine_config_load( m_xine, str.data() ); | 96 | QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf"; |
97 | xine_config_load( m_xine, QFile::encodeName( configPath ) ); | ||
92 | 98 | ||
93 | xine_init( m_xine ); | 99 | xine_init( m_xine ); |
94 | 100 | ||
95 | // allocate oss for sound | 101 | // allocate oss for sound |
@@ -115,8 +121,9 @@ Lib::Lib( XineVideoWidget* widget ) { | |||
115 | 121 | ||
116 | m_queue = xine_event_new_queue (m_stream); | 122 | m_queue = xine_event_new_queue (m_stream); |
117 | 123 | ||
118 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); | 124 | xine_event_create_listener_thread (m_queue, xine_event_handler, this); |
125 | |||
119 | } | 126 | } |
120 | 127 | ||
121 | Lib::~Lib() { | 128 | Lib::~Lib() { |
122 | // free( m_config ); | 129 | // free( m_config ); |
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 37a4f9a..d546c99 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -180,8 +180,10 @@ namespace XINE { | |||
180 | protected: | 180 | protected: |
181 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); | 181 | virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); |
182 | 182 | ||
183 | private: | 183 | private: |
184 | void initialize(); | ||
185 | |||
184 | int m_bytes_per_pixel; | 186 | int m_bytes_per_pixel; |
185 | bool m_video:1; | 187 | bool m_video:1; |
186 | XineVideoWidget *m_wid; | 188 | XineVideoWidget *m_wid; |
187 | xine_t *m_xine; | 189 | xine_t *m_xine; |