[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-multimedia
Subject: Re: [announce] xine aRts plugin 0.3-beta
From: Neil Stevens <neil () qualityassistant ! com>
Date: 2002-04-28 1:19:44
[Download RAW message or body]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Saturday April 27, 2002 01:45, Ewald Snel wrote:
> Hi Neil,
>
> > Hash: SHA1
> >
> > On Friday April 26, 2002 01:16, Ewald Snel wrote:
> > > Thanks, I have added '$(KDE_RPATH)' to the Makefile.am files of the
> > > latest beta (7). I hope this will solve your problem.
> >
> > Speaking of beta 7, on my local copy of HEAD I've incorporated changes
> > based on your kaboodle patch. As soon as your stuff is in cvs I'll
> > commit it.
>
> I have updated my patch. The most important mistake was not deleting the
> VideoWidget, which resulted in X errors when the xine PlayObject tried
> to render on the X11 Window.
Do you mean to say that you have to delete it for every use? I think that
should be encapsulated inside the KVideoWidget::embed() call itself, if
true.
> http://rambo.its.tudelft.nl/~ewald/xine/kaboodle-kvideo-20020427.patch
>
> But maybe you already fixed that problem. :)
I didn't actually try it with HEAD yet, since I was hoping your kvideo
stuff would be in HEAD soon, and I'd just try it then.
Attached is my patch. I don't even know if it compiles. :-)
- --
Neil Stevens - neil@qualityassistant.com
"I always cheer up immensely if an attack is particularly wounding
because I think, well, if they attack one personally, it means they
have not a single political argument left." - Margaret Thatcher
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iD8DBQE8y04wf7mnligQOmERAnJBAJ4+B8yEx3E/hRQAOXCGMIrKgQ/3fwCfUqsM
yK89Fjj5vvGnXmlNhsJoO+E=
=pze/
-----END PGP SIGNATURE-----
["kaboodle-kvideo-HEAD.patch" (text/x-diff)]
Index: engine.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/engine.cpp,v
retrieving revision 1.30
diff -u -r1.30 engine.cpp
--- engine.cpp 2002/04/12 11:28:11 1.30
+++ engine.cpp 2002/04/28 01:15:09
@@ -42,7 +42,6 @@
#include <flowsystem.h>
#include <kartsdispatcher.h>
#include <kartsserver.h>
-#include <kmedia2.h>
#include <kplayobjectfactory.h>
#include <soundserver.h>
@@ -199,6 +198,11 @@
{
if(!d->playobj) return false;
return d->playobj->object().capabilities() & Arts::capSeek;
+}
+
+Arts::PlayObject Engine::playObject() const
+{
+ return d->playobj ? d->playobj->object() : Arts::PlayObject::null();
}
#include "engine.moc"
Index: engine.h
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/engine.h,v
retrieving revision 1.13
diff -u -r1.13 engine.h
--- engine.h 2002/04/12 11:28:11 1.13
+++ engine.h 2002/04/28 01:15:09
@@ -25,6 +25,7 @@
#define _ENGINE_H
#include <qobject.h>
+#include <kmedia2.h>
#include <kmediaplayer/player.h>
#include <kurl.h>
@@ -48,6 +49,8 @@
public:
Engine(QObject *parent=0);
~Engine();
+
+ Arts::PlayObject Engine::playObject() const;
public slots:
/**
Index: player.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/player.cpp,v
retrieving revision 1.12
diff -u -r1.12 player.cpp
--- player.cpp 2002/04/12 12:11:35 1.12
+++ player.cpp 2002/04/28 01:15:09
@@ -105,6 +105,8 @@
pauseAction->setEnabled(false);
setState(Stop);
+ view->embed(engine->playObject());
+
tickerTimeout();
return true;
}
@@ -242,7 +244,6 @@
emit setWindowCaption(current.prettyURL());
}
}
-
Kaboodle::BrowserExtension::BrowserExtension(Player *parent)
: KParts::BrowserExtension(parent, "Kaboodle Browser Extension")
Index: player.h
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/player.h,v
retrieving revision 1.13
diff -u -r1.13 player.h
--- player.h 2002/04/12 12:11:35 1.13
+++ player.h 2002/04/28 01:15:09
@@ -24,6 +24,7 @@
#ifndef PLAYER_H
#define PLAYER_H
+#include <kmedia2.h>
#include <kmediaplayer/player.h>
#include <kparts/browserextension.h>
#include <kurl.h>
Index: userinterface.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/userinterface.cpp,v
retrieving revision 1.20
diff -u -r1.20 userinterface.cpp
--- userinterface.cpp 2002/04/25 11:03:59 1.20
+++ userinterface.cpp 2002/04/28 01:15:10
@@ -70,7 +70,6 @@
resize(320, minimumHeight());
applyMainWindowSettings(KGlobal::config());
- setFixedHeight(minimumHeight());
toolBar("mainToolBar")->hide();
toolbarAction->setChecked(!toolBar("KaboodleToolbar")->isHidden());
menubarAction->setChecked(!menuBar()->isHidden());
Index: view.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/view.cpp,v
retrieving revision 1.2
diff -u -r1.2 view.cpp
--- view.cpp 2002/04/12 12:11:35 1.2
+++ view.cpp 2002/04/28 01:15:10
@@ -67,6 +67,8 @@
box->setMargin(0);
box->show();
+ video = new KVideoWidget(box);
+
QWidget *sliderBox = new QWidget(box);
sliderBox->setFocusPolicy(QWidget::ClickFocus);
sliderBox->setAcceptDrops(true);
@@ -145,6 +147,7 @@
playButton->setEnabled(true);
pauseButton->setEnabled(false);
+ // loaded
if(oldState == KMediaPlayer::Player::Empty)
player->play();
@@ -228,6 +231,11 @@
void Kaboodle::View::setQuitAfterPlaying(bool b)
{
quitAfterPlaying = b;
+}
+
+void Kaboodle::View::embed(Arts::PlayObject object)
+{
+ video->embed(object);
}
void Kaboodle::View::updateButtons(int b)
Index: view.h
===================================================================
RCS file: /home/kde/kdemultimedia/kaboodle/view.h,v
retrieving revision 1.2
diff -u -r1.2 view.h
--- view.h 2002/04/12 12:11:35 1.2
+++ view.h 2002/04/28 01:15:10
@@ -38,6 +38,7 @@
class QButton;
class QLabel;
+class KVideoWidget;
namespace Kaboodle
{
@@ -61,6 +62,8 @@
bool isQuitAfterPlaying(void);
void setQuitAfterPlaying(bool);
+ void embed(Arts::PlayObject);
+
public slots:
void stateChanged(int);
void updateButtons(int);
@@ -82,6 +85,7 @@
L33tSlider *slider;
QLabel *elapsedLabel;
+ KVideoWidget *video;
QButton *playButton, *pauseButton, *stopButton;
};
_______________________________________________
kde-multimedia mailing list
kde-multimedia@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-multimedia
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic