-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 | |||
@@ -29,24 +29,25 @@ | |||
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | 31 | ||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <stdio.h> | 34 | #include <stdio.h> |
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include <qimage.h> | 36 | #include <qimage.h> |
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 | ||
45 | #include <assert.h> | 46 | #include <assert.h> |
46 | 47 | ||
47 | #include "xinevideowidget.h" | 48 | #include "xinevideowidget.h" |
48 | #include "frame.h" | 49 | #include "frame.h" |
49 | #include "lib.h" | 50 | #include "lib.h" |
50 | 51 | ||
51 | 52 | ||
52 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, | 53 | typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, |
@@ -64,40 +65,45 @@ extern "C" { | |||
64 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); | 65 | void null_set_gui_height( const xine_vo_driver_t* self, int height ); |
65 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); | 66 | void null_set_mode( const xine_vo_driver_t* self, int depth, int rgb ); |
66 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); | 67 | void null_set_videoGamma( const xine_vo_driver_t* self , int value ); |
67 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); | 68 | void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data ); |
68 | } | 69 | } |
69 | 70 | ||
70 | using namespace XINE; | 71 | using namespace XINE; |
71 | 72 | ||
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 |
96 | // and fb for framebuffer | 102 | // and fb for framebuffer |
97 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); | 103 | m_audioOutput = xine_open_audio_driver( m_xine, "oss", NULL ); |
98 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); | 104 | m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this ); |
99 | 105 | ||
100 | 106 | ||
101 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); | 107 | //xine_open_video_driver( m_xine, NULL, XINE_VISUAL_TYPE_FB, NULL); |
102 | 108 | ||
103 | 109 | ||
@@ -107,24 +113,25 @@ Lib::Lib( XineVideoWidget* widget ) { | |||
107 | 113 | ||
108 | if (m_wid != 0 ) { | 114 | if (m_wid != 0 ) { |
109 | printf( "!0\n" ); | 115 | printf( "!0\n" ); |
110 | resize ( m_wid-> size ( ) ); | 116 | resize ( m_wid-> size ( ) ); |
111 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); | 117 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); |
112 | 118 | ||
113 | m_wid->repaint(); | 119 | m_wid->repaint(); |
114 | } | 120 | } |
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 ); |
123 | 130 | ||
124 | xine_close( m_stream ); | 131 | xine_close( m_stream ); |
125 | 132 | ||
126 | xine_event_dispose_queue( m_queue ); | 133 | xine_event_dispose_queue( m_queue ); |
127 | 134 | ||
128 | xine_dispose( m_stream ); | 135 | xine_dispose( m_stream ); |
129 | 136 | ||
130 | xine_exit( m_xine ); | 137 | xine_exit( m_xine ); |
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 | |||
@@ -172,24 +172,26 @@ namespace XINE { | |||
172 | * XINE_ERROR_DEMUXER_FAILED 3 | 172 | * XINE_ERROR_DEMUXER_FAILED 3 |
173 | */ | 173 | */ |
174 | int error() const; | 174 | int error() const; |
175 | 175 | ||
176 | signals: | 176 | signals: |
177 | 177 | ||
178 | void stopped(); | 178 | void stopped(); |
179 | 179 | ||
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; |
188 | xine_stream_t *m_stream; | 190 | xine_stream_t *m_stream; |
189 | xine_cfg_entry_t *m_config; | 191 | xine_cfg_entry_t *m_config; |
190 | xine_vo_driver_t *m_videoOutput; | 192 | xine_vo_driver_t *m_videoOutput; |
191 | xine_ao_driver_t* m_audioOutput; | 193 | xine_ao_driver_t* m_audioOutput; |
192 | xine_event_queue_t *m_queue; | 194 | xine_event_queue_t *m_queue; |
193 | 195 | ||
194 | void handleXineEvent( const xine_event_t* t ); | 196 | void handleXineEvent( const xine_event_t* t ); |
195 | void handleXineEvent( int type ); | 197 | void handleXineEvent( int type ); |