summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-03 12:40:05 (UTC)
committer harlekin <harlekin>2002-08-03 12:40:05 (UTC)
commite97e6d869d0d3cb971a53f5a9ceacc1c93fcb3e0 (patch) (side-by-side diff)
tree5dff28f4c663f2fe3cb70c29ff1cb1122dcd6202
parented2394a99f071d4779498325476094255607d019 (diff)
downloadopie-e97e6d869d0d3cb971a53f5a9ceacc1c93fcb3e0.zip
opie-e97e6d869d0d3cb971a53f5a9ceacc1c93fcb3e0.tar.gz
opie-e97e6d869d0d3cb971a53f5a9ceacc1c93fcb3e0.tar.bz2
took the disturbing sound icon out
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 5ae6c21..eb57b67 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -30,97 +30,97 @@ extern "C" {
void null_set_mode( vo_driver_t* self, int depth, int rgb );
void null_display_handler(vo_driver_t* self, display_xine_frame_t t, void* user_data);
}
using namespace XINE;
Lib::Lib(XineVideoWidget* widget) {
m_video = false;
m_wid = widget;
printf("Lib");
QCString str( getenv("HOME") );
str += "/Settings/opiexine.cf";
// get the configuration
m_config = xine_config_file_init( str.data() );
// allocate oss for sound
// and fb for framebuffer
m_audioOutput= xine_load_audio_output_plugin( m_config, "oss") ;
if (m_audioOutput == NULL )
printf("Failure\n");
else
printf("Success\n");
// test code
/* m_videoOutput = xine_load_video_output_plugin(m_config, "fb",
VISUAL_TYPE_FB,
0 );
*/
char** files = xine_list_video_output_plugins(3);
char* out;
int i = 0;
while ( ( out = files[i] ) != 0 ) {
printf("Video %s\n", out );
i++;
}
// m_xine = xine_init( m_videoOutput,
// m_audioOutput,
// m_config );
// test loading
m_videoOutput = ::init_video_out_plugin( m_config, NULL );
if (m_wid != 0 ) {
printf("!0\n" );
::null_set_gui_width( m_videoOutput, m_wid->image()->width() );
::null_set_gui_height(m_videoOutput, m_wid->image()->height() );
::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
m_bytes_per_pixel = ( qt_screen->depth() + 7 ) / 8;
- QImage image = Resource::loadImage("SoundPlayer");
+ QImage image = Resource::loadImage("");
image = image.smoothScale( m_wid->width(), m_wid->height() );
QImage* img = new QImage( image );
m_wid->setImage( img );
m_wid->repaint();
}
null_display_handler( m_videoOutput,
xine_display_frame,
this );
m_xine = xine_init( m_videoOutput,
m_audioOutput, m_config );
// install the event handler
xine_register_event_listener( m_xine, xine_event_handler, this );
}
Lib::~Lib() {
delete m_config;
xine_remove_event_listener( m_xine, xine_event_handler );
xine_exit( m_xine );
delete m_videoOutput;
//delete m_audioOutput;
}
QCString Lib::version() {
QCString str( xine_get_str_version() );
return str;
};
int Lib::majorVersion() {
return xine_get_major_version();
}
int Lib::minorVersion() {
return xine_get_minor_version();
};
int Lib::subVersion() {
return xine_get_sub_version();
}
int Lib::play( const QString& fileName,
int startPos,
int start_time ) {
QString str = fileName.stripWhiteSpace();
//workaround OpiePlayer bug
if (str.right(1) == QString::fromLatin1("/") )
str = str.mid( str.length() -1 );
return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(),
startPos, start_time);