Nabble - CD Playing

DVD Menu from remote control

2009-12-06T13:45:03Z

Over the past couple of days I have been configuring my remote control to operate Kaffeine. I've got just about everything I want to work using the "config = dcop kaffeine KaffeineIface ..." commands, but there are two functions I would like to set-up that "decop" doesn't seep to support.

These two functions are related to DVD Menues. I would like to know how to cinfigure the remote to navigate through lists such as "episode list" and then select "X" episode to play. I cannot figure out the programming for those two functions.

I hope I am being clear on what I am asking as I am quite new to Linux.

If you need me to be more clear or know how to help I would greatly appreciate an e-mail.

Thank You
Jeremy
jeremy.j.weimer@...
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: Request: kaffeine --dvb start parameter

2009-12-05T14:45:48Z

Christoph Pfister schrieb:

2009/11/17 Boris Cuber kaffeine@...:

Hi kaffeine people,

One feature i miss from the old versions is the possibilty
to start kaffeine from the cmdline in dvb mode with
the last tuned channel.

This would also keep some compatability to ~kaffeine-0.8.x.
I dunno if this is really a "wanted" feature, but it improves my
tv/dvb watching experience. I'm sure this could also be done
by altering the --tv parameter, but i'm no qt/c++ programmer
and my tries ended up in segfaults when starting kaffeine.

Whatever, it'd be cool to have this feature back ;)



A simple patch (applies to trunk), adds a --dvb parameter:


Applied (I've called the option "--lastchannel").

strangely enough this works if I close kaffeine witch Ctrl-Q or close the window using the close-button of the window decoration, but it does not work when I close kaffeine using "qdbus /MainApplication quit". In this case the last channel is not remembered. I dont know what this dbus function really does, as it is automatically generated and not directly implemented in the kaffeine source... Maybe it simply kills the process???

cheers,
Pascal

------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: dbus support for kaffeine

2009-12-05T14:09:42Z

Hi Christoph,

with my old patch the channel ui didn't get updated when the channel was set
using the SetNumber(int) function, i now fixed it. I also cleaned up a
little bit my code in dvbtab.cpp and fixed a possible segmentation fault
when the dbus function SetDvbChannel(Qstring) was called with an invalid
name. The patch is against rev. 1053875.

Finally I managed to review, overwork and commit your patch ...

Thank you Christoph for taking my work into account and for this detailled explanation. I'm not sure I really made your life easier, as you finally had to change much of what I've done, but at least I could give a little push to the whole dbus thing ;) I will not go into all the points you mentioned, as it's all ok and I have nothing to add...

c) continue hacking (if you need a task, you can try to create a
kdelirc profile for kaffeine, that's an xml file which provides
default associations between remote control buttons and kaffeine dbus
interface [2])

I'll continue hacking for sure and will have a look at the kdelirc profiles, I think I can do something in the next time. I'm happy if I can help, you're doing great work and there are really much things to do, this cannot be taken for granted, all this work only because there is a new Qt version... Thumbs up!

ciao,
Pascal

Christoph Pfister schrieb:

Hi,

2009/11/24 Pascal pascal@...:

Hi Christoph,

with my old patch the channel ui didn't get updated when the channel was set
using the SetNumber(int) function, i now fixed it. I also cleaned up a
little bit my code in dvbtab.cpp and fixed a possible segmentation fault
when the dbus function SetDvbChannel(Qstring) was called with an invalid
name. The patch is against rev. 1053875.


Finally I managed to review, overwork and commit your patch ...

cheers,
pascal

+class MprisPlayerObject : public QObject
+{
+       Q_OBJECT
+       Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+       explicit MprisPlayerObject(MediaWidget *mediaWidget_);
+       ~MprisPlayerObject();
+
+public slots:
+       void Next();
+       void Prev();
+       void Play();
+       void Pause();
+       void Stop();
+       int  VolumeGet();
+       void VolumeSet(int volume);
+       int  PositionGet();
+       void PositionSet(int position);
+       void Repeat();


You forgot the bool parameter.

+       MprisStatusStruct GetStatus();
+       QVariantMap GetMetadata();


MPRIS metadata and Phonon metadata specifications aren't 100%
compatible ("location" means url in mpris terms, while it means
"location where track was recorded" in Phonon terms) ... I've left out
the metadata part for the moment.

+       int GetCaps();


All functions reordered into the order given by the spec.

+       // this functions are not part of the MPRIS specs
+       void PlayPause();


Not needed, Pause() has the same behaviour than mediaWidget's playPause action.

+       void VolumeIncrease();
+       void VolumeDecrease();


Renamed to "IncreaseVolume" and "DecreaseVolume".

+       void Play(const QString &url);


Not needed, TrackList has an AddTrack() function.

+       void PlayAudioCd();
+       void PlayVideoCd();
+       void PlayDvd();
+       void ChangeAudioChannel(int index);
+       void ChangeSubtitle(int index);
+       void LongSkipBackward();
+       void SkipBackward();
+       void SkipForward();
+       void LongSkipForward();
+       void TimeButtonClicked();


Left out for the moment (this has much to do with my workflow, not
with the actual content of the patch ... I'll think about those
functions once I have some spare time again).

+       void ToggleMuted();

+       void UpdateTimeButton();


Not needed, internal function.

+signals:
+       void CapsChange( int );
+       void StatusChange( MprisStatusStruct );
+       void TrackChange( QVariantMap );


Reordered into the order given by the spec.

+private:
+       MediaWidget *mediaWidget;

+class MprisTrackListObject : public QObject
+{
+       Q_OBJECT
+       Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+       explicit MprisTrackListObject(MediaWidget *mediaWidget_);
+       ~MprisTrackListObject();
+
+public slots:
+       QVariantMap GetMetadata();
+       int GetCurrentTrack();
+       int GetLength();
+       int AddTrack(QString track, bool play);


Use "const QString &", not "QString".

+       void DelTrack(int position);
+       void SetLoop(bool loop);
+       void SetRandom(bool random);
+
+signals:
+       void TrackListChange(int);
+
+private:
+       MediaWidget *mediaWidget;


All those functions have a relation to PlaylistTab, not to MediaWidget.

+class MprisDvbObject : public QObject


Renamed to "DBusTelevisionObject" (nothing to do with mpris).

+{
+       Q_OBJECT
+       Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+       explicit MprisDvbObject(MediaWidget *mediaWidget_);
+       ~MprisDvbObject();
+
+public slots:
+       void SetDvbChannel(const QString &name);
+       void SetDvbChannelNumber(int number);


Merged into a single function - playChannel(const QString &nameOrNumber);

+       void SetNumber(int number);


Not needed (what's the sense of this function?)
Added a DigitPressed(int) function, for entering channel numbers via
remote control.

+       void SetDvbLastChannel();


Renamed to PlayLastChannel().

+       void StopDvb();


Not needed, internal function.

+       void ToggleInstantRecord();
+       void ToggleOsd();
+
+private:
+       MediaWidget *mediaWidget;


All those functions have a relation to DvbTab, not to MediaWidget.

+       void AspectRatioAuto();
+       void AspectRatio4_3();
+       void AspectRatio16_9();
+       void AspectRatioWidget();


Left out for the moment (this has much to do with my workflow, not
with the actual content of the patch ... I'll think about those
functions once I have some spare time again).

+       void ToggleFullScreen();


Moved to the player object.

+struct MprisStatusStruct
+{
+       quint16 play;
+       quint16 random;
+       quint16 repeatTrack;
+       quint16 repeatAll;
+};


The spec says 32 bit integers (= int).

+Q_DECLARE_METATYPE(MprisStatusStruct)
+
+/**
+* The bit values for the capabilities flags
+*/
+enum Cap {
+       NO_CAPS                    = 0,
+       CAN_GO_NEXT                = 1 << 0,
+       CAN_GO_PREV                = 1 << 1,
+       CAN_PAUSE                        = 1 << 2,
+       CAN_PLAY                          = 1 << 3,
+       CAN_SEEK                          = 1 << 4,
+       CAN_PROVIDE_METADATA  = 1 << 5,
+       CAN_HAS_TRACKLIST        = 1 << 6,
+       ALL_KNOWN_CAPS          = (1 << 7) - 1
+};
+Q_DECLARE_FLAGS(Caps, Cap)


Directly merged into GetCaps (because it is the only function that
will use caps).

+signals:
+       void updateDvbChannelUi(int number);


Solved that problem in a different way (ChannelModel returns the row,
not the channel itself --> the proxy model can map that information to
the correct view model index).

+void DvbTab::toggleInstantRecord()
+{
+       if (instantRecordAction->isChecked()) {
+               instantRecordAction->setChecked(false);
+               instantRecord(false);
+       }
+       else {
+               instantRecordAction->setChecked(true);
+               instantRecord(true);
+       }


Simply use instantRecordAction->trigger();

+}

+bool MediaWidget::isPaused()
+{
+       if (playing && mediaObject->state() == Phonon::PausedState)
+       {
+               return true;
+       }
+       return false;


Query the playPauseAction.

+}
+int MediaWidget::getVolume()
+{
+       int volume = audioOutput->volume() * 100;
+
+       if ( volume >= 0 && volume <= 100 ) {
+               return volume;
+       }
+
+       return 0;


Query the volumeSlider.

+}
+
 void MediaWidget::changeVolume(int volume)
 {
       audioOutput->setVolume(volume * qreal(0.01));
@@ -915,6 +1014,16 @@
       mediaObject->seek(mediaObject->currentTime() + 1000 *
longSkipDuration);
 }

 class MediaWidget : public QWidget
 {
       Q_OBJECT
+       friend class MprisPlayerObject;
+       friend class MprisTrackListObject;
+       friend class MprisDvbObject;
+       friend class MprisDisplayObject;


Do not use friend classes for this purpose because of two reasons:
- there are internal functions that _really_ shouldn't be called from
outside (e.g. volumeChanged or mutedChanged, because they don't update
ui state)
- private functions usually trust their arguments etc, but in this
context more value checking is needed for calls from outside

So I've made the required functions public and rechecked that they
work correctly in all situations.

+       bool hasMedia();
+       void setNumber(int number);
+       void changeDvbChannel(int number);
+       void changeDvbChannel(const QString &name);
+       void toggleOsd();
+       void dvbLastChannel();
+       void toggleInstantRecord();
+       int getCurrentTrack();
+       void playPause();
+       void pause();
+       void setDvbChannel(int number);
+       void setDvbChannel(const QString &name);
+       void setDvbLastChannel();
+       void fullScreen();
+       void delTrack(int position);
+       void setLoop(bool loop);
+       void setRandom(bool random);


Removed all those functions because they are a) redundant (playPause,
pause --> simplified to togglePause()) or b) don't belong here (the
dbus objects call directly the needed functions from PlaylistTab or
DvbTab).

I suggest the following steps to proceed:
a) study the comments above a bit; the patches I've commited are [1];
feel free to ask questions
b) make your svn repo clean and update it
c) continue hacking (if you need a task, you can try to create a
kdelirc profile for kaffeine, that's an xml file which provides
default associations between remote control buttons and kaffeine dbus
interface [2])

Thanks a lot,

Christoph


[1]
http://websvn.kde.org/?view=revision&revision=1055907
http://websvn.kde.org/?view=revision&revision=1056261
http://websvn.kde.org/?view=revision&revision=1056694
[2]
the resulting file would be installed to
/usr/share/kde4/apps/profiles/kaffeine.profile.xml

------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: Kaffeine 1.0-pre2

2009-11-30T09:18:48Z

2009/11/28 James W. Bennett <jw-bennett@...>:
> Kaffeine works now. I swapped DVD's drives. I had a Lite-on in high order
> and samsung in low sata order. Once I made the switch Kaffeine worked good.
> The Lite-on is a brand new drive. Samsung is several months old.
>
> Thank you Christoph you got me on the right path.

The problem is that phonon doesn't care about the device path, so
always the "first" drive (= which is more or less arbitrary) is used.
I'm aware of this issue and hope to resolve it soon.

> Jim Bennett

Christoph

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-30T09:15:03Z

Hi,

2009/11/24 Pascal <pascal@...>:
> Hi Christoph,
>
> with my old patch the channel ui didn't get updated when the channel was set
> using the SetNumber(int) function, i now fixed it. I also cleaned up a
> little bit my code in dvbtab.cpp and fixed a possible segmentation fault
> when the dbus function SetDvbChannel(Qstring) was called with an invalid
> name. The patch is against rev. 1053875.

Finally I managed to review, overwork and commit your patch ...

> cheers,
> pascal

> +class MprisPlayerObject : public QObject
> +{
> + Q_OBJECT
> + Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
> +public:
> + explicit MprisPlayerObject(MediaWidget *mediaWidget_);
> + ~MprisPlayerObject();
> +
> +public slots:
> + void Next();
> + void Prev();
> + void Play();
> + void Pause();
> + void Stop();
> + int VolumeGet();
> + void VolumeSet(int volume);
> + int PositionGet();
> + void PositionSet(int position);
> + void Repeat();

You forgot the bool parameter.

> + MprisStatusStruct GetStatus();
> + QVariantMap GetMetadata();

MPRIS metadata and Phonon metadata specifications aren't 100%
compatible ("location" means url in mpris terms, while it means
"location where track was recorded" in Phonon terms) ... I've left out
the metadata part for the moment.

> + int GetCaps();

All functions reordered into the order given by the spec.

> + // this functions are not part of the MPRIS specs
> + void PlayPause();

Not needed, Pause() has the same behaviour than mediaWidget's playPause action.

> + void VolumeIncrease();
> + void VolumeDecrease();

Renamed to "IncreaseVolume" and "DecreaseVolume".

> + void Play(const QString &url);

Not needed, TrackList has an AddTrack() function.

> + void PlayAudioCd();
> + void PlayVideoCd();
> + void PlayDvd();
> + void ChangeAudioChannel(int index);
> + void ChangeSubtitle(int index);
> + void LongSkipBackward();
> + void SkipBackward();
> + void SkipForward();
> + void LongSkipForward();
> + void TimeButtonClicked();

Left out for the moment (this has much to do with my workflow, not
with the actual content of the patch ... I'll think about those
functions once I have some spare time again).

> + void ToggleMuted();

> + void UpdateTimeButton();

Not needed, internal function.

> +signals:
> + void CapsChange( int );
> + void StatusChange( MprisStatusStruct );
> + void TrackChange( QVariantMap );

Reordered into the order given by the spec.

> +private:
> + MediaWidget *mediaWidget;

> +class MprisTrackListObject : public QObject
> +{
> + Q_OBJECT
> + Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
> +public:
> + explicit MprisTrackListObject(MediaWidget *mediaWidget_);
> + ~MprisTrackListObject();
> +
> +public slots:
> + QVariantMap GetMetadata();
> + int GetCurrentTrack();
> + int GetLength();
> + int AddTrack(QString track, bool play);

Use "const QString &", not "QString".

> + void DelTrack(int position);
> + void SetLoop(bool loop);
> + void SetRandom(bool random);
> +
> +signals:
> + void TrackListChange(int);
> +
> +private:
> + MediaWidget *mediaWidget;

All those functions have a relation to PlaylistTab, not to MediaWidget.

> +class MprisDvbObject : public QObject

Renamed to "DBusTelevisionObject" (nothing to do with mpris).

> +{
> + Q_OBJECT
> + Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
> +public:
> + explicit MprisDvbObject(MediaWidget *mediaWidget_);
> + ~MprisDvbObject();
> +
> +public slots:
> + void SetDvbChannel(const QString &name);
> + void SetDvbChannelNumber(int number);

Merged into a single function - playChannel(const QString &nameOrNumber);

> + void SetNumber(int number);

Not needed (what's the sense of this function?)
Added a DigitPressed(int) function, for entering channel numbers via
remote control.

> + void SetDvbLastChannel();

Renamed to PlayLastChannel().

> + void StopDvb();

Not needed, internal function.

> + void ToggleInstantRecord();
> + void ToggleOsd();
> +
> +private:
> + MediaWidget *mediaWidget;

All those functions have a relation to DvbTab, not to MediaWidget.

> + void AspectRatioAuto();
> + void AspectRatio4_3();
> + void AspectRatio16_9();
> + void AspectRatioWidget();

Left out for the moment (this has much to do with my workflow, not
with the actual content of the patch ... I'll think about those
functions once I have some spare time again).

> + void ToggleFullScreen();

Moved to the player object.

> +struct MprisStatusStruct
> +{
> + quint16 play;
> + quint16 random;
> + quint16 repeatTrack;
> + quint16 repeatAll;
> +};

The spec says 32 bit integers (= int).

> +Q_DECLARE_METATYPE(MprisStatusStruct)
> +
> +/**
> +* The bit values for the capabilities flags
> +*/
> +enum Cap {
> + NO_CAPS = 0,
> + CAN_GO_NEXT = 1 << 0,
> + CAN_GO_PREV = 1 << 1,
> + CAN_PAUSE = 1 << 2,
> + CAN_PLAY = 1 << 3,
> + CAN_SEEK = 1 << 4,
> + CAN_PROVIDE_METADATA = 1 << 5,
> + CAN_HAS_TRACKLIST = 1 << 6,
> + ALL_KNOWN_CAPS = (1 << 7) - 1
> +};
> +Q_DECLARE_FLAGS(Caps, Cap)

Directly merged into GetCaps (because it is the only function that
will use caps).

> +signals:
> + void updateDvbChannelUi(int number);

Solved that problem in a different way (ChannelModel returns the row,
not the channel itself --> the proxy model can map that information to
the correct view model index).

> +void DvbTab::toggleInstantRecord()
> +{
> + if (instantRecordAction->isChecked()) {
> + instantRecordAction->setChecked(false);
> + instantRecord(false);
> + }
> + else {
> + instantRecordAction->setChecked(true);
> + instantRecord(true);
> + }

Simply use instantRecordAction->trigger();

> +}

> +bool MediaWidget::isPaused()
> +{
> + if (playing && mediaObject->state() == Phonon::PausedState)
> + {
> + return true;
> + }
> + return false;

Query the playPauseAction.

> +}
> +int MediaWidget::getVolume()
> +{
> + int volume = audioOutput->volume() * 100;
> +
> + if ( volume >= 0 && volume <= 100 ) {
> + return volume;
> + }
> +
> + return 0;

Query the volumeSlider.

> +}
> +
> void MediaWidget::changeVolume(int volume)
> {
> audioOutput->setVolume(volume * qreal(0.01));
> @@ -915,6 +1014,16 @@
> mediaObject->seek(mediaObject->currentTime() + 1000 *
> longSkipDuration);
> }

> class MediaWidget : public QWidget
> {
> Q_OBJECT
> + friend class MprisPlayerObject;
> + friend class MprisTrackListObject;
> + friend class MprisDvbObject;
> + friend class MprisDisplayObject;

Do not use friend classes for this purpose because of two reasons:
- there are internal functions that _really_ shouldn't be called from
outside (e.g. volumeChanged or mutedChanged, because they don't update
ui state)
- private functions usually trust their arguments etc, but in this
context more value checking is needed for calls from outside

So I've made the required functions public and rechecked that they
work correctly in all situations.

> + bool hasMedia();
> + void setNumber(int number);
> + void changeDvbChannel(int number);
> + void changeDvbChannel(const QString &name);
> + void toggleOsd();
> + void dvbLastChannel();
> + void toggleInstantRecord();
> + int getCurrentTrack();
> + void playPause();
> + void pause();
> + void setDvbChannel(int number);
> + void setDvbChannel(const QString &name);
> + void setDvbLastChannel();
> + void fullScreen();
> + void delTrack(int position);
> + void setLoop(bool loop);
> + void setRandom(bool random);

Removed all those functions because they are a) redundant (playPause,
pause --> simplified to togglePause()) or b) don't belong here (the
dbus objects call directly the needed functions from PlaylistTab or
DvbTab).

I suggest the following steps to proceed:
a) study the comments above a bit; the patches I've commited are [1];
feel free to ask questions
b) make your svn repo clean and update it
c) continue hacking (if you need a task, you can try to create a
kdelirc profile for kaffeine, that's an xml file which provides
default associations between remote control buttons and kaffeine dbus
interface [2])

Thanks a lot,

Christoph

[1]
http://websvn.kde.org/?view=revision&revision=1055907
http://websvn.kde.org/?view=revision&revision=1056261
http://websvn.kde.org/?view=revision&revision=1056694
[2]
the resulting file would be installed to
/usr/share/kde4/apps/profiles/kaffeine.profile.xml

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

EPG view improvements

2009-11-29T04:04:40Z

Hello,

I changed programs list view to follow selection
in the channels list, and program description to follow
selection change in the programs list.
It makes much easier to navigate EPG.

I also connected the EPG view to recordings manager,
so scheduled for recording programs are marked in
the EPG programs list (nothing fancy yet, just the 'R'
symbol in the extra column, it would be nice to replace it with
corresponding icon, or draw the row with red color).
It also changed "Schedule" button to toggle program scheduling.

The implementation is not the most effective (the recording manager is queried
for each program in the list), but it seems to be sufficient in this case.

I attached the patch for the current kaffeine (svn revision 1056100).

Regards
Dmytro.

[kaffeine_epg_recordings.diff]

Index: src/dvb/dvbepg.h =================================================================== --- src/dvb/dvbepg.h (revision 1055919) +++ src/dvb/dvbepg.h (working copy) @@ -53,10 +53,12 @@ } }; +class DvbRecordingManager; class DvbEpgModel : public QAbstractTableModel { + Q_OBJECT public: - explicit DvbEpgModel(QObject *parent); + explicit DvbEpgModel(DvbRecordingManager *recordingManager, QObject *parent); ~DvbEpgModel(); int columnCount(const QModelIndex &parent) const; @@ -71,9 +73,14 @@ const DvbEpgEntry *getEntry(int row) const; QList<DvbEpgEntry> getCurrentNext(const QString &channel) const; +private slots: + void updateRecordings(); + private: + DvbRecordingManager *recordingManager; QList<DvbEpgEntry> allEntries; - QList<const DvbEpgEntry *> filteredEntries; + QList<const DvbEpgEntry *> filteredEntries; + mutable QHash<const DvbEpgEntry *, bool> recordingsStatusCache; }; class DvbEitFilter : public DvbSectionFilter Index: src/dvb/dvbrecording.h =================================================================== --- src/dvb/dvbrecording.h (revision 1055919) +++ src/dvb/dvbrecording.h (working copy) @@ -36,8 +36,15 @@ explicit DvbRecordingManager(DvbManager *manager_); ~DvbRecordingManager(); + bool isScheduled(const QString &channel, const QDateTime &begin, + const QTime &duration) const;// begin must be local time! + void scheduleProgram(const QString &name, const QString &channel, const QDateTime &begin, const QTime &duration); // begin must be local time! + + bool unscheduleProgram(const QString &channel, const QDateTime &begin, + const QTime &duration); // begin must be local time! + void startInstantRecording(const QString &name, const QString &channel); void stopInstantRecording(); // stops the last started instant recording @@ -45,6 +52,7 @@ signals: void instantRecordingRemoved(); // not emitted by stopInstantRecording() + void changed(); private slots: void checkStatus(); @@ -54,6 +62,8 @@ void removeRecording(); private: + QModelIndex recordingIndex(const QString &channel, const QDateTime &begin, + const QTime &duration) const; DvbManager *manager; DvbRecordingModel *model; QTimer checkStatusTimer; Index: src/dvb/dvbmanager.cpp =================================================================== --- src/dvb/dvbmanager.cpp (revision 1055919) +++ src/dvb/dvbmanager.cpp (working copy) @@ -227,9 +227,9 @@ parent(parent_), mediaWidget(mediaWidget_), dvbDumpEnabled(false) { channelModel = new DvbSqlChannelModel(this); - epgModel = new DvbEpgModel(this); + recordingManager = new DvbRecordingManager(this); + epgModel = new DvbEpgModel(recordingManager, this); liveView = new DvbLiveView(this); - recordingManager = new DvbRecordingManager(this); readDeviceConfigs(); updateSourceMapping(); Index: src/dvb/dvbepg.cpp =================================================================== --- src/dvb/dvbepg.cpp (revision 1055919) +++ src/dvb/dvbepg.cpp (working copy) @@ -79,7 +79,8 @@ return x < y.channel; } -DvbEpgModel::DvbEpgModel(QObject *parent) : QAbstractTableModel(parent) +DvbEpgModel::DvbEpgModel(DvbRecordingManager *recordingManager, QObject *parent) + : QAbstractTableModel(parent), recordingManager(recordingManager) { QFile file(KStandardDirs::locateLocal("appdata", "epgdata.dvb")); @@ -124,6 +125,8 @@ } qSort(allEntries); + + connect(recordingManager, SIGNAL(changed()), SLOT(updateRecordings())); } DvbEpgModel::~DvbEpgModel() @@ -163,7 +166,7 @@ return 0; } - return 3; + return 4; } int DvbEpgModel::rowCount(const QModelIndex &parent) const @@ -186,11 +189,21 @@ switch (index.column()) { case 0: + if (recordingsStatusCache.contains(entry)) { + return recordingsStatusCache.value(entry) ? QString("R") : QString(); + } else { + bool hasRecording = recordingManager->isScheduled( + entry->channel, entry->begin.toLocalTime(), entry->duration); + recordingsStatusCache.insert(entry, hasRecording); + return hasRecording ? QString("R") : QString(); + } + case 1: return KGlobal::locale()->formatDateTime(entry->begin.toLocalTime()); - case 1: + case 2: return KGlobal::locale()->formatTime(entry->duration, false, true); - case 2: + case 3: return entry->title; + } return QVariant(); @@ -204,10 +217,12 @@ switch (section) { case 0: - return i18n("Begin"); + return i18n("R"); case 1: + return i18n("Begin"); + case 2: return i18n("Duration"); - case 2: + case 3: return i18n("Title"); } @@ -237,9 +252,16 @@ void DvbEpgModel::resetChannel() { filteredEntries.clear(); + recordingsStatusCache.clear(); reset(); } +void DvbEpgModel::updateRecordings() +{ + recordingsStatusCache.clear(); + emit dataChanged(index(0,0,QModelIndex()), index(allEntries.size(),1,QModelIndex())); +} + void DvbEpgModel::setChannel(const QString &channel) { QList<DvbEpgEntry>::const_iterator it = qLowerBound(allEntries.constBegin(), @@ -415,11 +437,13 @@ channelView = new QListView(widget); channelView->setModel(channelModel); channelView->setMaximumWidth(200); + channelView->setEditTriggers(QAbstractItemView::NoEditTriggers); connect(channelView, SIGNAL(activated(QModelIndex)), this, SLOT(channelActivated(QModelIndex))); boxLayout->addWidget(channelView); mainLayout->addLayout(boxLayout); + boxLayout = new QVBoxLayout(); KAction *scheduleAction = new KAction(KIcon("media-record"), @@ -438,10 +462,18 @@ epgView->setContextMenuPolicy(Qt::ActionsContextMenu); epgView->setMinimumWidth(450); epgView->setModel(epgModel); - epgView->setRootIsDecorated(false); - connect(epgView, SIGNAL(activated(QModelIndex)), this, SLOT(entryActivated(QModelIndex))); + epgView->setRootIsDecorated(false); boxLayout->addWidget(epgView); + QItemSelectionModel *programSelection = new QItemSelectionModel(epgModel, this); + epgView->setSelectionModel(programSelection); + connect(programSelection, SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(entryActivated(QModelIndex))); + + QItemSelectionModel *channelSelection = new QItemSelectionModel(channelModel, this); + channelView->setSelectionModel(channelSelection); + connect(channelSelection, SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(channelActivated(QModelIndex))); + contentLabel = new QLabel(widget); contentLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop); contentLabel->setMargin(5); @@ -468,6 +500,7 @@ } setMainWidget(widget); + resize(800,600); } DvbEpgDialog::~DvbEpgDialog() @@ -553,8 +586,21 @@ const DvbEpgEntry *entry = epgModel->getEntry(index.row()); - manager->getRecordingManager()->scheduleProgram(entry->title, entry->channel, - entry->begin.toLocalTime().addSecs(-300), entry->duration.addSecs(900)); + qDebug () << "Schedule" << entry->title << entry->channel << + entry->begin << entry->duration; - KMessageBox::information(this, i18nc("program guide", "Program successfully scheduled.")); + DvbRecordingManager *recordingManager = manager->getRecordingManager(); + + bool hasRecording = recordingManager->isScheduled(entry->channel, + entry->begin.toLocalTime(), entry->duration); + + if (hasRecording) { + recordingManager->unscheduleProgram(entry->channel, + entry->begin.toLocalTime(), entry->duration); + } else { + recordingManager->scheduleProgram(entry->title, entry->channel, + entry->begin.toLocalTime().addSecs(-120), entry->duration.addSecs(180)); + } + //no need for message box, since the recording status is displayed in trable view. + //KMessageBox::information(this, i18nc("program guide", "Program successfully scheduled.")); } Index: src/dvb/dvbrecording.cpp =================================================================== --- src/dvb/dvbrecording.cpp (revision 1055919) +++ src/dvb/dvbrecording.cpp (working copy) @@ -271,6 +271,10 @@ connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(checkInstantRecording())); + connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SIGNAL(changed())); + connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SIGNAL(changed())); + connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SIGNAL(changed())); + // we regularly recheck the status of the recordings // this way we can keep retrying if the device was busy / tuning failed @@ -337,6 +341,48 @@ { } +QModelIndex DvbRecordingManager::recordingIndex(const QString &channel, const QDateTime &begin, + const QTime &duration) const +{ + for (int i=0; i<model->rowCount(QModelIndex()); i++) { + const DvbRecording *recording = model->at(i);// recordings.at(i); + + if (recording->repeat == 0 && recording->begin.date() != begin.date()) + continue; + + if (begin < recording->begin) + continue; + + if (recording->channelName != channel) + continue; + + if (recording->repeat) { + int dayOfWeek = begin.date().dayOfWeek(); + if ( !(recording->repeat & (1<<(dayOfWeek-1))) ) + continue; + } + + //day is correct, check if the time interval is covered + QTime recordingTime = recording->begin.time(); + QTime recordingEndTime = recordingTime.addSecs( QTime().secsTo(recording->duration) ); + QTime requestedTime = begin.time(); + QTime requestedEndTime = requestedTime.addSecs( QTime().secsTo(duration)-1 ); + + if (recordingTime <= requestedTime && + recordingEndTime >= requestedEndTime) { + return model->index(i,0); + } + } + + return QModelIndex(); +} + +bool DvbRecordingManager::isScheduled(const QString &channel, const QDateTime &begin, + const QTime &duration) const +{ + return recordingIndex(channel,begin,duration).isValid(); +} + void DvbRecordingManager::scheduleProgram(const QString &name, const QString &channel, const QDateTime &begin, const QTime &duration) { @@ -352,6 +398,18 @@ model->append(recording); } +bool DvbRecordingManager::unscheduleProgram(const QString &channel, const QDateTime &begin, + const QTime &duration) // begin must be local time! +{ + QModelIndex index = recordingIndex(channel, begin, duration); + if (index.isValid()) { + model->remove(index.row()); + return true; + } + + return false; +} + void DvbRecordingManager::startInstantRecording(const QString &name, const QString &channel) { DvbRecording *recording = new DvbRecording(manager); @@ -483,7 +541,7 @@ } } - checkingStatus = false; + checkingStatus = false; } void DvbRecordingManager::checkInstantRecording()

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: Kaffeine 1.0-pre2

2009-11-28T13:47:06Z

On 11/28/2009 07:33 AM, James W. Bennett wrote:

On 11/28/2009 06:36 AM, Christoph Pfister wrote:
2009/11/22 James W. Bennett jw-bennett@...:
  
Kaffeine displays the following message when in uses. Cannot find input
plugin for MRL [cadda:/].
Can anyone tell me what that message means.
    
possible reasons:
1) you're trying to play an audio cd but there's no cd in the drive
(do you have more than one drive?)
2) you don't have permission to read audio cd
3) something is wrong with xine / phonon configuration (are you sure
it's [cadda:/] and not [cdda:/]?)

  
Thank you;
Jim Bennett
    
Christoph

  
Hi;
I am using Fedora 12 linux. I have have two sata cdroms. Also when I first installed Fedora 12 Kaffeine worked fine. But when I turned off my computer
and disconnected all cables to dress them. Reinstalled cables and started computer Kaffeine never worked again. I would continue to get error message - Cannot find input plugin for MRL [cdda:/]. When everything worked I was only able to use high order DVD. Second drive would always cause the same error. But I was happy to have it work on one DVD drive.

Thanks for your replay.
Jim Bennett
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user
  

Kaffeine works now. I swapped DVD's drives. I had a Lite-on in high order and samsung in low sata order. Once I made the switch Kaffeine worked good.
The Lite-on is a brand new drive. Samsung is several months old.

Thank you Christoph you got me on the right path.
Jim Bennett

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: Request: kaffeine --dvb start parameter

2009-11-28T05:46:21Z

2009/11/17 Boris Cuber <kaffeine@...>:

> Hi kaffeine people,
>
> One feature i miss from the old versions is the possibilty
> to start kaffeine from the cmdline in dvb mode with
> the last tuned channel.
>
> This would also keep some compatability to ~kaffeine-0.8.x.
> I dunno if this is really a "wanted" feature, but it improves my
> tv/dvb watching experience. I'm sure this could also be done
> by altering the --tv parameter, but i'm no qt/c++ programmer
> and my tries ended up in segfaults when starting kaffeine.
>
> Whatever, it'd be cool to have this feature back ;)
>
>
>
> A simple patch (applies to trunk), adds a --dvb parameter:

Applied (I've called the option "--lastchannel").

Thanks,

Christoph

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: Kaffeine 1.0-pre2

2009-11-28T05:33:46Z

On 11/28/2009 06:36 AM, Christoph Pfister wrote:

2009/11/22 James W. Bennett jw-bennett@...:

Kaffeine displays the following message when in uses. Cannot find input
plugin for MRL [cadda:/].
Can anyone tell me what that message means.

possible reasons:
1) you're trying to play an audio cd but there's no cd in the drive
(do you have more than one drive?)
2) you don't have permission to read audio cd
3) something is wrong with xine / phonon configuration (are you sure
it's [cadda:/] and not [cdda:/]?)

Thank you;
Jim Bennett

Christoph

Hi;
I am using Fedora 12 linux. I have have two sata cdroms. Also when I first installed Fedora 12 Kaffeine worked fine. But when I turned off my computer
and disconnected all cables to dress them. Reinstalled cables and started computer Kaffeine never worked again. I would continue to get error message - Cannot find input plugin for MRL [cdda:/]. When everything worked I was only able to use high order DVD. Second drive would always cause the same error. But I was happy to have it work on one DVD drive.

Thanks for your replay.
Jim Bennett

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: [Fwd: dvb-c at-KarrerNet]

2009-11-28T04:48:24Z

2009/11/21 Thomas E. Horner <office@...>:
> hi!
>
> pfa the updated list of channels.

Updated, thanks!

Christoph

> br,
> thomas
>
>
> -------- Original-Nachricht --------
> Betreff: dvb-c at-KarrerNet
> Datum: Sat, 10 Jan 2009 12:04:45 +0100
> Von: Thomas E. Horner <office@...>
> An: kaffeine-user@...
>
>
>
> hi folks!
>
> i live in st. florian bei linz / austria, postal code A-4490.
> i just created the attached kaffeine dvb-c scan list out of a w_scan list.
> i verified it by scanning for channels and everything (including epg) now
> works fine.
> also, all channels in the karrernet cable network were found correctly using
> the list.
> i ask you to include the file in future releases so other users may scan
> more conveniently.
>
> br,
> thomas
>
>
>
>
> # Kabel St. Florian bei Linz/AT KarrerNet
> # 2009-01-10
> # freq sr fec mod
> C 442000000 6900000 NONE QAM64
> C 458000000 6900000 NONE QAM64
> C 466000000 6900000 NONE QAM64
> C 474000000 6900000 NONE QAM64
> C 482000000 6900000 NONE QAM64
> C 490000000 6900000 NONE QAM64
> C 498000000 6900000 NONE QAM64
> C 506000000 6900000 NONE QAM64
> C 514000000 6900000 NONE QAM64
> C 522000000 6900000 NONE QAM64
> C 530000000 6900000 NONE QAM64
> C 538000000 6900000 NONE QAM64
> C 546000000 6900000 NONE QAM64
> C 554000000 6900000 NONE QAM64
> C 562000000 6900000 NONE QAM64
> C 570000000 6900000 NONE QAM64
> C 578000000 6900000 NONE QAM64
> C 586000000 6900000 NONE QAM64
> C 610000000 6900000 NONE QAM64
> C 386000000 6900000 NONE QAM256
> C 394000000 6900000 NONE QAM256
> C 410000000 6900000 NONE QAM256
> C 434000000 6900000 NONE QAM256

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: Kaffeine 1.0-pre2

2009-11-28T04:36:37Z

2009/11/22 James W. Bennett <jw-bennett@...>:
> Kaffeine displays the following message when in uses. Cannot find input
> plugin for MRL [cadda:/].
> Can anyone tell me what that message means.

possible reasons:
1) you're trying to play an audio cd but there's no cd in the drive
(do you have more than one drive?)
2) you don't have permission to read audio cd
3) something is wrong with xine / phonon configuration (are you sure
it's [cadda:/] and not [cdda:/]?)

> Thank you;
> Jim Bennett

Christoph

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: uk-Redruth post digital-switchover network\location as of today

2009-11-28T04:14:57Z

2009/11/22 g_remlin <g_remlin@...>:

> #T 474167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
> (duplicate 690000000)
> T 497833000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
> (duplicate 650166670) better SNR
> #T 506167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
> (duplicate 634167000)
> T 521833000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
> T 634167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # West
> Cornwall.. (duplicate 506167000) better SNR
> #T 650166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE # (duplicate
> 497833000)
> T 658167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
> T 690000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
> (duplicate 474167000) better SNR
> T 714000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE

Updated, thanks!

Christoph

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-24T14:54:54Z

Hi Christoph,

with my old patch the channel ui didn't get updated when the channel was
set using the SetNumber(int) function, i now fixed it. I also cleaned up
a little bit my code in dvbtab.cpp and fixed a possible segmentation
fault when the dbus function SetDvbChannel(Qstring) was called with an
invalid name. The patch is against rev. 1053875.

cheers,
pascal

Pascal schrieb:

> I forgot to add a check if the parameter is a single digit integer in
> the MediaWidget::setNumber(int) function, here is the new patch,
> please forget the other one...
>
> ciao,
> Pascal
>
> Pascal schrieb:
>> Hi,
>>
>> I now added the SetNumber(int) function to enter numbers with
>> multiple digits, that was really easy, as the code to enter numbers
>> with the keyboard was already there. I didn't notice it before
>> because there is one problem left with this code: entering numbers
>> with the keyboard has no effect if the DvbChannelView has the focus,
>> in this case you have to click into the picture before to make it
>> work. Number-key events in the DvbChannelView should maybe be
>> redirected somehow to the MediaWidget class...
>>
>> I also removed some debugging code that was still present in my last
>> patch, sorry...
>>
>> The patch is against the actual svn trunk again (revision 1053111)
>>
>> ciao,
>> Pascal
>>
>>
>> Pascal schrieb:
>>> Hi,
>>>
>>> ok, here is the actual state of things. The mpris methods are all
>>> implemented, with a few stubs left: a few /TrackList methods still
>>> need to be implemented, but I will try to do it soon. The /Player
>>> Repeat() function is also a stub, because the playlist does not
>>> allow to repeat a single track yet. Also the GetCaps () function is
>>> incomplete.
>>>
>>> I put much methods into the /Player object which are not part of the
>>> mpris specs, because it wouldn't make much sense to make a separate
>>> object for them. I think it should be ok, but if you don't agree,
>>> please tell me, it' not difficult to change...
>>>
>>> I made a DVB/ object for dvb-related stuff and a Display/ object for
>>> methods like toggleFullScreen, I'm not sure if "Display" is the best
>>> name for that...
>>>
>>> There is still a need for a method that allows to enter channel
>>> numbers with more than one digit with a remote control (or with the
>>> keyboard), I will try to do this in the next time, as for me it's
>>> the most important feature which is still missing.
>>>
>>> I changed all dbus functions to begin with a capital letter, to be
>>> consistent with the mpris methods.
>>>
>>> All this isn't thoroughly tested at all and rather crude, and there
>>> should certainly be more error checking, but I think this is true
>>> for almost all the rest of the app also, so it should be ok for the
>>> beginning ;)
>>>
>>>>> changing the channel works, but I didn't manage to have the selection
>>>>> changed to the new channel in the DvbChannelView tree. I don't
>>>>> know how to
>>>>> get a valid QModelIndex that points to the correct
>>>>> DvbChannelModel. Please
>>>>> look at the code and at my comments in DvbTab::setChannel(int
>>>>> number). I
>>>>> tried almost everything and thereby learned a lot about the model
>>>>> / view
>>>>> concept of Qt, but it didn't help me to find the solution... Maybe
>>>>> you
>>>>> already know this probem Christoph, because there is the same
>>>>> issue when
>>>>> kaffeine gets started with the "--tv <channel>" flag: it simply calls
>>>>> DvbTab::playChannel(const QString &name), but it does not select
>>>>> the channel
>>>>> in the DvbChannelView. The problem is that afterwards, calls to
>>>>> MediaWidget::previous() and next() have no effect, because the
>>>>> currently
>>>>> selected channel is not known. I hope that someone more clever
>>>>> than me will
>>>>> solve this issue ;)
>>>>
>>>> Yes, this one is trickier. Note that there exists a similar problem
>>>> e.g. with playPause(): you also need to update the ui state.
>>>>
>>> I now found a solution (although I don't know if it's the best), but
>>> I don't recognize what should be updated when the playPause() method
>>> is called, you have a better overview for sure...
>>>
>>> ciao,
>>> Pascal
>>>
>>>
>>> Christoph Pfister schrieb:
>>>> Hi,
>>>>
>>>> 2009/11/6 Pascal Pollet <pascal@...>:
>>>>
>>>>> Hi,
>>>>>
>>>>> here is what I've done so far, I think it should add enough d-bus
>>>>> to make
>>>>> most users happy, including me :) Please look at it and tell me
>>>>> what you
>>>>> think of it...
>>>>>
>>>>
>>>> It's a very good starting point. There exists a mediaplayer dbus
>>>> specification MPRIS [1], which I consider worth to implement (so that
>>>> we don't add yet another dbus interface for common functionality).
>>>> I've committed preliminary support to svn (the "root" object). Could
>>>> you please adapt your patch to that concept (i.e. add a tracklist and
>>>> player object; in case of need just method stubs)? I'm aware of the
>>>> fact that the actions defined in that specification don't 100% map
>>>> Kaffeine's actions (e.g. Play() doing a rewind to the beginning of a
>>>> track), so you don't have to care about those details if you don't
>>>> want to do. I also know that not every mpris thing is possible
>>>> (especially the tracklist parts needs more work) and that there's not
>>>> a mpris thing for every action Kaffeine is able to perform (put them
>>>> in a separate object for now).
>>>>
>>>>
>>>>> There is one problem left, when selecting a new DVB-channel
>>>>> directly by name
>>>>> or by number, with the (new) functions:
>>>>>
>>>>> dvbTab::setChannel(const QString &name)
>>>>> and
>>>>> DvbTab::setChannel(int number)
>>>>>
>>>>> changing the channel works, but I didn't manage to have the selection
>>>>> changed to the new channel in the DvbChannelView tree. I don't
>>>>> know how to
>>>>> get a valid QModelIndex that points to the correct
>>>>> DvbChannelModel. Please
>>>>> look at the code and at my comments in DvbTab::setChannel(int
>>>>> number). I
>>>>> tried almost everything and thereby learned a lot about the model
>>>>> / view
>>>>> concept of Qt, but it didn't help me to find the solution... Maybe
>>>>> you
>>>>> already know this probem Christoph, because there is the same
>>>>> issue when
>>>>> kaffeine gets started with the "--tv <channel>" flag: it simply calls
>>>>> DvbTab::playChannel(const QString &name), but it does not select
>>>>> the channel
>>>>> in the DvbChannelView. The problem is that afterwards, calls to
>>>>> MediaWidget::previous() and next() have no effect, because the
>>>>> currently
>>>>> selected channel is not known. I hope that someone more clever
>>>>> than me will
>>>>> solve this issue ;)
>>>>>
>>>>
>>>> Yes, this one is trickier. Note that there exists a similar problem
>>>> e.g. with playPause(): you also need to update the ui state.
>>>>
>>>>
>>>>> cheers,
>>>>> Pascal
>>>>>
>>>>
>>>> Thanks,
>>>>
>>>> Christoph
>>>>
>>>>
>>>> [1] http://wiki.xmms2.xmms.se/wiki/MPRIS
>>>>
>>>>
>>>

diff -Naur ../kaffeine/src/dbusobjects.cpp ./src/dbusobjects.cpp
--- ../kaffeine/src/dbusobjects.cpp 2009-11-24 23:27:03.000000000 +0100
+++ ./src/dbusobjects.cpp 2009-11-24 23:44:23.000000000 +0100
@@ -23,6 +23,9 @@
#include <QDBusMetaType>
#include <KAboutData>
#include <KApplication>
+#include <KUrl>
+
+#include "mediawidget.h"

QDBusArgument &operator<<(QDBusArgument &argument, const MprisVersionStruct &versionStruct)
{
@@ -40,9 +43,27 @@
return argument;
}

+QDBusArgument &operator<<(QDBusArgument &argument, const MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument << statusStruct.play << statusStruct.random << statusStruct.repeatTrack << statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument >> statusStruct.play >> statusStruct.random >> statusStruct.repeatTrack >> statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+
MprisRootObject::MprisRootObject(QObject *parent) : QObject(parent)
{
qDBusRegisterMetaType<MprisVersionStruct>();
+ qDBusRegisterMetaType<MprisStatusStruct>();
}

MprisRootObject::~MprisRootObject()
@@ -67,3 +88,325 @@
versionStruct.minor = 0;
return versionStruct;
}
+
+MprisPlayerObject::MprisPlayerObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisPlayerObject::~MprisPlayerObject()
+{ }
+
+void MprisPlayerObject::Next()
+{
+ mediaWidget->next();
+}
+
+void MprisPlayerObject::Prev()
+{
+ mediaWidget->previous();
+}
+
+void MprisPlayerObject::PlayPause()
+{
+ mediaWidget->playPause();
+}
+
+void MprisPlayerObject::Play()
+{
+ mediaWidget->play();
+}
+
+void MprisPlayerObject::Pause()
+{
+ mediaWidget->pause();
+}
+
+int MprisPlayerObject::VolumeGet()
+{
+ return mediaWidget->getVolume();
+}
+
+void MprisPlayerObject::VolumeSet(int volume)
+{
+ mediaWidget->changeVolume(volume);
+}
+
+void MprisPlayerObject::VolumeIncrease()
+{
+ mediaWidget->increaseVolume();
+}
+
+void MprisPlayerObject::VolumeDecrease()
+{
+ mediaWidget->decreaseVolume();
+}
+
+int MprisPlayerObject::PositionGet()
+{
+ return mediaWidget->getPosition();
+}
+
+
+void MprisPlayerObject::PositionSet(int position)
+{
+ mediaWidget->setPosition(position);
+}
+
+void MprisPlayerObject::Repeat()
+{
+ //TODO
+ //repeating a single track not implemented yet, only whole playlist
+}
+
+int MprisPlayerObject::GetCaps()
+{
+ int caps = NO_CAPS;
+
+ if ( mediaWidget->hasMedia() )
+ {
+ if ( mediaWidget->isPlaying() && ! mediaWidget->isPaused() )
+ {
+ caps |= CAN_PAUSE;
+ }
+ else
+ {
+ caps |= CAN_PLAY;
+ }
+ }
+
+ caps |= CAN_HAS_TRACKLIST;
+
+ //TODO: CAN_GO_NEXT & CAN_GO_PREV & CAN_PROVIDE_METADATA
+
+ return caps;
+}
+
+void MprisPlayerObject::Stop()
+{
+ mediaWidget->stop();
+}
+
+MprisStatusStruct MprisPlayerObject::GetStatus()
+{
+ MprisStatusStruct statusStruct;
+ if ( mediaWidget->isPaused() )
+ {
+ statusStruct.play = 1;
+ }
+ else if ( mediaWidget->isPlaying() )
+ {
+ statusStruct.play = 0;
+ }
+ else
+ {
+ statusStruct.play = 2;
+ }
+
+ if ( mediaWidget->isRepeat() )
+ {
+ statusStruct.repeatAll = 1;
+ }
+ else
+ {
+ statusStruct.repeatAll = 0;
+ }
+
+ statusStruct.random = 0;
+ statusStruct.repeatTrack = 0;
+
+ return statusStruct;
+}
+
+QVariantMap MprisPlayerObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+void MprisPlayerObject::Play(const QString &url)
+{
+ KUrl kurl(url);
+ if (kurl.isValid()) {
+ mediaWidget->play(kurl);
+ }
+}
+
+void MprisPlayerObject::PlayAudioCd()
+{
+ mediaWidget->playAudioCd();
+}
+
+void MprisPlayerObject::PlayVideoCd()
+{
+ mediaWidget->playVideoCd();
+}
+
+void MprisPlayerObject::PlayDvd()
+{
+ mediaWidget->playDvd();
+}
+
+void MprisPlayerObject::ChangeAudioChannel(int index)
+{
+ mediaWidget->changeAudioChannel(index);
+}
+
+void MprisPlayerObject::ChangeSubtitle(int index)
+{
+ mediaWidget->changeSubtitle(index);
+}
+
+void MprisPlayerObject::ToggleMuted()
+{
+ mediaWidget->toggleMuted();
+}
+
+void MprisPlayerObject::LongSkipBackward()
+{
+ mediaWidget->longSkipBackward();
+}
+
+void MprisPlayerObject::SkipBackward()
+{
+ mediaWidget->skipBackward();
+}
+
+void MprisPlayerObject::SkipForward()
+{
+ mediaWidget->skipForward();
+}
+
+void MprisPlayerObject::LongSkipForward()
+{
+ mediaWidget->longSkipForward();
+}
+
+void MprisPlayerObject::TimeButtonClicked()
+{
+ mediaWidget->timeButtonClicked();
+}
+
+void MprisPlayerObject::UpdateTimeButton()
+{
+ mediaWidget->updateTimeButton();
+}
+
+
+MprisTrackListObject::MprisTrackListObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisTrackListObject::~MprisTrackListObject()
+{ }
+
+QVariantMap MprisTrackListObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+int MprisTrackListObject::GetCurrentTrack()
+{
+ return mediaWidget->getCurrentTrack();
+}
+
+int MprisTrackListObject::GetLength()
+{
+ return mediaWidget->getLength();
+}
+
+int MprisTrackListObject::AddTrack(QString track, bool play)
+{
+ return mediaWidget->addTrack(track, play);
+}
+
+void MprisTrackListObject::DelTrack(int position)
+{
+ mediaWidget->delTrack(position);
+}
+
+void MprisTrackListObject::SetLoop(bool loop)
+{
+ mediaWidget->setLoop(loop);
+}
+
+void MprisTrackListObject::SetRandom(bool random)
+{
+ mediaWidget->setRandom(random);
+}
+
+
+
+MprisDvbObject::MprisDvbObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDvbObject::~MprisDvbObject()
+{ }
+
+void MprisDvbObject::SetDvbChannel(const QString &name)
+{
+ mediaWidget->setDvbChannel(name);
+}
+
+void MprisDvbObject::SetDvbChannelNumber(int number)
+{
+ mediaWidget->setDvbChannel(number);
+}
+
+void MprisDvbObject::SetNumber(int number)
+{
+ mediaWidget->setNumber(number);
+}
+
+void MprisDvbObject::SetDvbLastChannel()
+{
+ mediaWidget->setDvbLastChannel();
+}
+
+void MprisDvbObject::StopDvb()
+{
+ mediaWidget->stopDvb();
+}
+
+void MprisDvbObject::ToggleInstantRecord()
+{
+ mediaWidget->toggleInstantRecord();
+}
+
+void MprisDvbObject::ToggleOsd()
+{
+ mediaWidget->toggleOsd();
+}
+
+
+
+MprisDisplayObject::MprisDisplayObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDisplayObject::~MprisDisplayObject()
+{ }
+
+void MprisDisplayObject::ToggleFullScreen()
+{
+ mediaWidget->fullScreen();
+}
+
+void MprisDisplayObject::AspectRatioAuto()
+{
+ mediaWidget->aspectRatioAuto();
+}
+
+void MprisDisplayObject::AspectRatio4_3()
+{
+ mediaWidget->aspectRatio4_3();
+}
+
+void MprisDisplayObject::AspectRatio16_9()
+{
+ mediaWidget->aspectRatio16_9();
+}
+
+void MprisDisplayObject::AspectRatioWidget()
+{
+ mediaWidget->aspectRatioWidget();
+}
+
+
+
+
diff -Naur ../kaffeine/src/dbusobjects.h ./src/dbusobjects.h
--- ../kaffeine/src/dbusobjects.h 2009-11-24 23:27:03.000000000 +0100
+++ ./src/dbusobjects.h 2009-11-24 23:44:27.000000000 +0100
@@ -22,8 +22,12 @@
#define DBUSOBJECTS_H

#include <QMetaType>
+#include <QVariantMap>

struct MprisVersionStruct;
+struct MprisStatusStruct;
+
+class MediaWidget;

class MprisRootObject : public QObject
{
@@ -39,6 +43,130 @@
MprisVersionStruct MprisVersion();
};

+
+class MprisPlayerObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisPlayerObject(MediaWidget *mediaWidget_);
+ ~MprisPlayerObject();
+
+public slots:
+ void Next();
+ void Prev();
+ void Play();
+ void Pause();
+ void Stop();
+ int VolumeGet();
+ void VolumeSet(int volume);
+ int PositionGet();
+ void PositionSet(int position);
+ void Repeat();
+ MprisStatusStruct GetStatus();
+ QVariantMap GetMetadata();
+ int GetCaps();
+
+ // this functions are not part of the MPRIS specs
+ void PlayPause();
+ void VolumeIncrease();
+ void VolumeDecrease();
+ void Play(const QString &url);
+ void PlayAudioCd();
+ void PlayVideoCd();
+ void PlayDvd();
+ void ChangeAudioChannel(int index);
+ void ChangeSubtitle(int index);
+ void ToggleMuted();
+ void LongSkipBackward();
+ void SkipBackward();
+ void SkipForward();
+ void LongSkipForward();
+ void TimeButtonClicked();
+ void UpdateTimeButton();
+
+signals:
+ void CapsChange( int );
+ void StatusChange( MprisStatusStruct );
+ void TrackChange( QVariantMap );
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisTrackListObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisTrackListObject(MediaWidget *mediaWidget_);
+ ~MprisTrackListObject();
+
+public slots:
+ QVariantMap GetMetadata();
+ int GetCurrentTrack();
+ int GetLength();
+ int AddTrack(QString track, bool play);
+ void DelTrack(int position);
+ void SetLoop(bool loop);
+ void SetRandom(bool random);
+
+signals:
+ void TrackListChange(int);
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDvbObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDvbObject(MediaWidget *mediaWidget_);
+ ~MprisDvbObject();
+
+public slots:
+ void SetDvbChannel(const QString &name);
+ void SetDvbChannelNumber(int number);
+ void SetNumber(int number);
+ void SetDvbLastChannel();
+ void StopDvb();
+ void ToggleInstantRecord();
+ void ToggleOsd();
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDisplayObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDisplayObject(MediaWidget *mediaWidget_);
+ ~MprisDisplayObject();
+
+public slots:
+ void AspectRatioAuto();
+ void AspectRatio4_3();
+ void AspectRatio16_9();
+ void AspectRatioWidget();
+ void ToggleFullScreen();
+
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
struct MprisVersionStruct
{
quint16 major;
@@ -47,4 +175,30 @@

Q_DECLARE_METATYPE(MprisVersionStruct)

+struct MprisStatusStruct
+{
+ quint16 play;
+ quint16 random;
+ quint16 repeatTrack;
+ quint16 repeatAll;
+};
+
+Q_DECLARE_METATYPE(MprisStatusStruct)
+
+/**
+* The bit values for the capabilities flags
+*/
+enum Cap {
+ NO_CAPS = 0,
+ CAN_GO_NEXT = 1 << 0,
+ CAN_GO_PREV = 1 << 1,
+ CAN_PAUSE = 1 << 2,
+ CAN_PLAY = 1 << 3,
+ CAN_SEEK = 1 << 4,
+ CAN_PROVIDE_METADATA = 1 << 5,
+ CAN_HAS_TRACKLIST = 1 << 6,
+ ALL_KNOWN_CAPS = (1 << 7) - 1
+};
+Q_DECLARE_FLAGS(Caps, Cap)
+
#endif /* DBUSOBJECTS_H */
diff -Naur ../kaffeine/src/dvb/dvbliveview.cpp ./src/dvb/dvbliveview.cpp
--- ../kaffeine/src/dvb/dvbliveview.cpp 2009-11-24 23:27:03.000000000 +0100
+++ ./src/dvb/dvbliveview.cpp 2009-11-24 23:46:14.000000000 +0100
@@ -440,6 +440,7 @@

if (channel != NULL) {
playChannel(channel);
+ emit updateDvbChannelUi(channel.data()->number);
}
}

diff -Naur ../kaffeine/src/dvb/dvbliveview.h ./src/dvb/dvbliveview.h
--- ../kaffeine/src/dvb/dvbliveview.h 2009-11-24 23:27:03.000000000 +0100
+++ ./src/dvb/dvbliveview.h 2009-11-24 23:46:19.000000000 +0100
@@ -44,6 +44,9 @@

void playChannel(const QSharedDataPointer<DvbChannel> &channel_);

+signals:
+ void updateDvbChannelUi(int number);
+
private slots:
void pmtSectionChanged(const DvbPmtSection &pmtSection);
void insertPatPmt();
diff -Naur ../kaffeine/src/dvb/dvbtab.cpp ./src/dvb/dvbtab.cpp
--- ../kaffeine/src/dvb/dvbtab.cpp 2009-11-24 23:27:03.000000000 +0100
+++ ./src/dvb/dvbtab.cpp 2009-11-24 23:46:14.000000000 +0100
@@ -117,6 +117,10 @@

connect(mediaWidget, SIGNAL(previousDvbChannel()), this, SLOT(previousChannel()));
connect(mediaWidget, SIGNAL(nextDvbChannel()), this, SLOT(nextChannel()));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(const QString&)), this, SLOT(setChannel(const QString&)));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(int)), this, SLOT(setChannel(int)));
+ connect(mediaWidget, SIGNAL(dvbLastChannel()), this, SLOT(setLastChannel()));
+ connect(mediaWidget, SIGNAL(toggleInstantRecord()), this, SLOT(toggleInstantRecord()));

connect(manager->getRecordingManager(), SIGNAL(instantRecordingRemoved()),
this, SLOT(instantRecordingRemoved()));
@@ -144,7 +148,7 @@
channelView->setRootIsDecorated(false);

if (!channelView->header()->restoreState(QByteArray::fromBase64(
- KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
+ KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
channelView->sortByColumn(0, Qt::AscendingOrder);
}

@@ -195,6 +199,8 @@
QTimer *timer = new QTimer(this);
timer->start(30000);
connect(timer, SIGNAL(timeout()), this, SLOT(cleanTimeShiftFiles()));
+
+ connect(manager->getLiveView(), SIGNAL(updateDvbChannelUi(int)), this, SLOT(updateDvbChannelUi(int)));
}

DvbTab::~DvbTab()
@@ -210,6 +216,11 @@
playChannel(manager->getChannelModel()->channelForName(name));
}

+void DvbTab::playChannel(int number)
+{
+ playChannel(manager->getChannelModel()->channelForNumber(number));
+}
+
void DvbTab::playLastChannel()
{
playChannel(KGlobal::config()->group("DVB").readEntry("LastChannel"));
@@ -244,6 +255,19 @@
dialog.exec();
}

+void DvbTab::toggleInstantRecord()
+{
+ if (instantRecordAction->isChecked()) {
+ instantRecordAction->setChecked(false);
+ instantRecord(false);
+ }
+ else {
+ instantRecordAction->setChecked(true);
+ instantRecord(true);
+ }
+}
+
+
void DvbTab::instantRecord(bool checked)
{
if (checked) {
@@ -349,6 +373,49 @@
void DvbTab::playChannel(const QSharedDataPointer<DvbChannel> &channel)
{
if (channel != NULL) {
+ updateDvbChannelUi(channel->number);
manager->getLiveView()->playChannel(channel);
}
}
+
+void DvbTab::setChannel(const QString &name)
+{
+ QSharedDataPointer<DvbChannel> channel = manager->getChannelModel()->channelForName(name);
+ if (channel != NULL) {
+ updateDvbChannelUi(channel.data()->number);
+ }
+ playChannel(name);
+}
+
+void DvbTab::setChannel(int number)
+{
+ updateDvbChannelUi(number);
+ playChannel(number);
+
+}
+
+void DvbTab::setLastChannel()
+{
+ playLastChannel();
+}
+
+void DvbTab::updateDvbChannelUi(int number)
+{
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 1), Qt::DisplayRole, number, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+}
+
diff -Naur ../kaffeine/src/dvb/dvbtab.h ./src/dvb/dvbtab.h
--- ../kaffeine/src/dvb/dvbtab.h 2009-11-24 23:27:03.000000000 +0100
+++ ./src/dvb/dvbtab.h 2009-11-24 23:46:19.000000000 +0100
@@ -38,11 +38,13 @@
class DvbTab : public TabBase
{
Q_OBJECT
+
public:
DvbTab(KMenu *menu, KActionCollection *collection, MediaWidget *mediaWidget_);
~DvbTab();

void playChannel(const QString &name);
+ void playChannel(int number);
void playLastChannel();

void enableDvbDump();
@@ -52,12 +54,17 @@
void showEpgDialog();
void showRecordingDialog();
void instantRecord(bool checked);
+ void toggleInstantRecord();
void instantRecordingRemoved();
void configureDvb();
void playLive(const QModelIndex &index);
void previousChannel();
void nextChannel();
void cleanTimeShiftFiles();
+ void setChannel(const QString &name);
+ void setChannel(int number);
+ void setLastChannel();
+ void updateDvbChannelUi(int number);

private:
void activate();
diff -Naur ../kaffeine/src/kaffeine.cpp ./src/kaffeine.cpp
--- ../kaffeine/src/kaffeine.cpp 2009-11-24 23:27:03.000000000 +0100
+++ ./src/kaffeine.cpp 2009-11-24 23:44:23.000000000 +0100
@@ -327,6 +327,15 @@
// initialize dbus objects
QDBusConnection::sessionBus().registerObject("/", new MprisRootObject(this),
QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Player", new MprisPlayerObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/TrackList", new MprisTrackListObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/DVB", new MprisDvbObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Display", new MprisDisplayObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+
QDBusConnection::sessionBus().registerService("org.mpris.kaffeine");

show();
diff -Naur ../kaffeine/src/mediawidget.cpp ./src/mediawidget.cpp
--- ../kaffeine/src/mediawidget.cpp 2009-11-24 23:27:03.000000000 +0100
+++ ./src/mediawidget.cpp 2009-11-24 23:44:23.000000000 +0100
@@ -374,6 +374,8 @@
connect(timer, SIGNAL(timeout()), this, SLOT(checkScreenSaver()));

stateChanged(Phonon::StoppedState);
+
+ setRepeat(false);
}

MediaWidget::~MediaWidget()
@@ -543,6 +545,67 @@
}
}

+bool MediaWidget::isPaused()
+{
+ if (playing && mediaObject->state() == Phonon::PausedState)
+ {
+ return true;
+ }
+ return false;
+}
+
+// also returns true when paused
+bool MediaWidget::isPlaying()
+{
+ return playing;
+}
+
+void MediaWidget::setRepeat(bool repeat_)
+{
+ repeat = repeat_;
+}
+
+bool MediaWidget::isRepeat()
+{
+ return repeat;
+}
+
+bool MediaWidget::hasMedia()
+{
+ if ( mediaObject->currentSource().type() != Phonon::MediaSource::Invalid ) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+void MediaWidget::setDvbChannel(int number)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(number);
+ }
+}
+
+void MediaWidget::setDvbChannel(const QString &name)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(name);
+ }
+}
+
+void MediaWidget::setDvbLastChannel()
+{
+ if (dvbFeed != NULL) {
+ emit dvbLastChannel();
+ }
+}
+
+void MediaWidget::fullScreen()
+{
+ emit toggleFullScreen();
+}
+
void MediaWidget::stateChanged(Phonon::State state)
{
bool newPlaying = false;
@@ -655,6 +718,31 @@
}
}

+void MediaWidget::playPause() {
+ //if (actionPlayPause->text() == textPlay) {
+ if (isPaused()) {
+ playPause(false);
+ }
+ else {
+ playPause(true);
+ }
+}
+
+void MediaWidget::play() {
+ if (playing && actionPlayPause->text() == textPlay) {
+ playPause(false);
+ }
+ else if (!playing) {
+ emit playlistPlay();
+ }
+}
+
+void MediaWidget::pause() {
+ if (playing && actionPlayPause->text() == textPause) {
+ playPause(true);
+ }
+}
+
void MediaWidget::stop()
{
mediaObject->stop();
@@ -726,6 +814,17 @@
}
}

+int MediaWidget::getVolume()
+{
+ int volume = audioOutput->volume() * 100;
+
+ if ( volume >= 0 && volume <= 100 ) {
+ return volume;
+ }
+
+ return 0;
+}
+
void MediaWidget::changeVolume(int volume)
{
audioOutput->setVolume(volume * qreal(0.01));
@@ -915,6 +1014,16 @@
mediaObject->seek(mediaObject->currentTime() + 1000 * longSkipDuration);
}

+void MediaWidget::setPosition(int position)
+{
+ mediaObject->seek(position);
+}
+
+int MediaWidget::getPosition()
+{
+ return mediaObject->currentTime();
+}
+
void MediaWidget::jumpToPosition()
{
JumpToPositionDialog dialog(QTime().addMSecs(mediaObject->currentTime()), this);
@@ -1150,3 +1259,64 @@
subtitleBox->setEnabled(false);
}
}
+
+QVariantMap MediaWidget::getMetadata()
+{
+ QVariantMap ret;
+ QMultiMap<QString, QString> multiMap = mediaObject->metaData();
+ QMultiMap<QString, QString>::const_iterator i = multiMap.constBegin();
+
+ while( i != multiMap.constEnd() )
+ {
+ ret[ i.key() ] = QVariant( i.value() );
+ i++;
+ }
+ return ret;
+}
+
+int getNumberOfTracks()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getCurrentTrack()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getLength()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::addTrack(QString track, bool play)
+{
+ //TODO
+ return 0;
+}
+
+void MediaWidget::delTrack(int position)
+{
+ //TODO
+}
+
+void MediaWidget::setLoop(bool loop)
+{
+ setRepeat(loop);
+}
+
+void MediaWidget::setRandom(bool random)
+{
+ //TODO
+}
+
+void MediaWidget::setNumber(int number)
+{
+ if (number >= 0 && number <= 9) {
+ emit osdKeyPressed(number + Qt::Key_0);
+ }
+}
+
diff -Naur ../kaffeine/src/mediawidget.h ./src/mediawidget.h
--- ../kaffeine/src/mediawidget.h 2009-11-24 23:27:03.000000000 +0100
+++ ./src/mediawidget.h 2009-11-24 23:44:27.000000000 +0100
@@ -48,9 +48,14 @@
class MediaWidget : public QWidget
{
Q_OBJECT
+ friend class MprisPlayerObject;
+ friend class MprisTrackListObject;
+ friend class MprisDvbObject;
+ friend class MprisDisplayObject;
+
public:
MediaWidget(KMenu *menu_, KAction *fullScreenAction, KToolBar *toolBar,
- KActionCollection *collection, QWidget *parent);
+ KActionCollection *collection, QWidget *parent);
~MediaWidget();

static QString extensionFilter(); // usable for KFileDialog::setFilter()
@@ -78,6 +83,12 @@
void setShortSkipDuration(int duration);
void setLongSkipDuration(int duration);

+ void setRepeat(bool repeat_);
+ bool isRepeat();
+ bool hasMedia();
+
+ void setNumber(int number);
+
public slots:
void stop();
void stopDvb();
@@ -98,14 +109,35 @@
void startDvbTimeShift();
void changeDvbAudioChannel(int index);
void changeDvbSubtitle(int index);
+ void changeDvbChannel(int number);
+ void changeDvbChannel(const QString &name);
void dvbStopped();
void osdKeyPressed(int key);
+ void toggleOsd();
+
+ void dvbLastChannel();
+ void toggleInstantRecord();
+

private slots:
+ bool isPlaying();
+ bool isPaused();
+
+ int getPosition();
+ int getCurrentTrack();
+ int getLength();
+ int addTrack(QString track, bool play);
+ int getVolume();
+
+ QVariantMap getMetadata();
+
void stateChanged(Phonon::State state);
void playbackFinished();
void previous();
void playPause(bool paused);
+ void playPause();
+ void play();
+ void pause();
void next();
void changeAudioChannel(int index);
void changeSubtitle(int index);
@@ -132,6 +164,7 @@
void skipForward();
void longSkipForward();
void jumpToPosition();
+ void setPosition(int position);
void timeButtonClicked();
void updateTimeButton();
void updateCaption();
@@ -144,6 +177,17 @@

void checkScreenSaver();

+ void setDvbChannel(int number);
+ void setDvbChannel(const QString &name);
+ void setDvbLastChannel();
+
+ void fullScreen();
+
+ void delTrack(int position);
+ void setLoop(bool loop);
+ void setRandom(bool random);
+
+
private:
void contextMenuEvent(QContextMenuEvent *event);
void mouseDoubleClickEvent(QMouseEvent *);
@@ -204,6 +248,8 @@
KAction *jumpToPositionAction;
QPushButton *timeButton;
bool showElapsedTime;
+ bool repeat;
+ int inputNumber;
};

#endif /* MEDIAWIDGET_H */
diff -Naur ../kaffeine/src/playlist/playlistmodel.cpp ./src/playlist/playlistmodel.cpp
--- ../kaffeine/src/playlist/playlistmodel.cpp 2009-11-24 23:27:03.000000000 +0100
+++ ./src/playlist/playlistmodel.cpp 2009-11-24 23:27:04.000000000 +0100
@@ -48,6 +48,7 @@
QAbstractTableModel(parent), mediaWidget(mediaWidget_), repeat(false)
{
setSupportedDragActions(Qt::MoveAction);
+ mediaWidget->setRepeat(false);

connect(mediaWidget, SIGNAL(playlistPrevious()), this, SLOT(playPreviousTrack()));
connect(mediaWidget, SIGNAL(playlistPlay()), this, SLOT(playCurrentTrack()));
@@ -351,6 +352,7 @@
void PlaylistModel::repeatPlaylist(bool repeat_)
{
repeat = repeat_;
+ mediaWidget->setRepeat(repeat);
}

static bool playlistIndexLess(const PlaylistTrack &x, const PlaylistTrack &y)

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: Kaffeine Scans, Kaffeine Won't Play

2009-11-23T10:38:15Z

On Mon, 23 Nov 2009, Joel Mayer wrote:

> Dear Fellow Kaffeine Users-
>
> I am on a dual boot lap top running Windows XP Pro and SuSE Linux
> 11.1. I have a Hauppauge 1950 (model 1192) USB tv box which I am
> certain is configured properly. The correct drivers, firmware, and
> firmware extractor, were provided for me by Justin Piszcz.
>
> When I type in as root from a terminal:
>
> mplayer -vf yadif /dev/video1
>
> I am able to watch one single cable tv channel.
>
> New to Kaffeine, I am able to scan for channels but have not been
> able to get any single one of them to play. When I type in as root:
>
> kaffeine -vf yadif /dev/video1 the message I get is:
>
> kbuild sycoca running ... /dev/dvb/adaptor0/frontend0 : opened
> (Samsung S5H1411 QAM/8VSB Frontend) 0 EPG plugins loaded
> for device 0 : 0 Loaded epg data : 0 events ( 0 msecs )
>
> Can you tell me what this means? Do you have any suggestions?
> (I live in the state of Michigan, so the cable tv broadcast format
> I need will probably be different from yours.)
>
> Thanks / Joel Mayer / joelm_armillary@...<mailto:joelm_armillary@...>
>
>

Hi Joel,

It looks like you need to set the channel via v4lctl:
http://klk64.com/wintv-hvr-1950/

The command:
v4lctl setchannel ##

So:
v4lctl setchannel 10
v4lctl setchannel 11

Let me know if this works, I'd be curious, I do not have a regular cable
box, only DVR and the stream is encrypted so I cannot test, thanks :)

Justin.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Kaffeine Scans, Kaffeine Won't Play

2009-11-23T10:05:12Z

Dear Fellow Kaffeine Users-

I am on a dual boot lap top running Windows XP Pro and SuSE Linux

11.1. I have a Hauppauge 1950 (model 1192) USB tv box which I am

certain is configured properly. The correct drivers, firmware, and

firmware extractor, were provided for me by Justin Piszcz.

When I type in as root from a terminal:

mplayer -vf yadif /dev/video1

I am able to watch one single cable tv channel.

New to Kaffeine, I am able to scan for channels but have not been

able to get any single one of them to play. When I type in as root:

kaffeine -vf yadif /dev/video1 the message I get is:

kbuild sycoca running ... /dev/dvb/adaptor0/frontend0 : opened

(Samsung S5H1411 QAM/8VSB Frontend) 0 EPG plugins loaded

for device 0 : 0 Loaded epg data : 0 events ( 0 msecs )

Can you tell me what this means? Do you have any suggestions?

(I live in the state of Michigan, so the cable tv broadcast format

I need will probably be different from yours.)

Thanks / Joel Mayer / joelm_armillary@...

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-23T03:14:28Z

I forgot to add a check if the parameter is a single digit integer in
the MediaWidget::setNumber(int) function, here is the new patch, please
forget the other one...

ciao,
Pascal

Pascal schrieb:

> Hi,
>
> I now added the SetNumber(int) function to enter numbers with multiple
> digits, that was really easy, as the code to enter numbers with the
> keyboard was already there. I didn't notice it before because there is
> one problem left with this code: entering numbers with the keyboard
> has no effect if the DvbChannelView has the focus, in this case you
> have to click into the picture before to make it work. Number-key
> events in the DvbChannelView should maybe be redirected somehow to the
> MediaWidget class...
>
> I also removed some debugging code that was still present in my last
> patch, sorry...
>
> The patch is against the actual svn trunk again (revision 1053111)
>
> ciao,
> Pascal
>
>
> Pascal schrieb:
>> Hi,
>>
>> ok, here is the actual state of things. The mpris methods are all
>> implemented, with a few stubs left: a few /TrackList methods still
>> need to be implemented, but I will try to do it soon. The /Player
>> Repeat() function is also a stub, because the playlist does not allow
>> to repeat a single track yet. Also the GetCaps () function is
>> incomplete.
>>
>> I put much methods into the /Player object which are not part of the
>> mpris specs, because it wouldn't make much sense to make a separate
>> object for them. I think it should be ok, but if you don't agree,
>> please tell me, it' not difficult to change...
>>
>> I made a DVB/ object for dvb-related stuff and a Display/ object for
>> methods like toggleFullScreen, I'm not sure if "Display" is the best
>> name for that...
>>
>> There is still a need for a method that allows to enter channel
>> numbers with more than one digit with a remote control (or with the
>> keyboard), I will try to do this in the next time, as for me it's the
>> most important feature which is still missing.
>>
>> I changed all dbus functions to begin with a capital letter, to be
>> consistent with the mpris methods.
>>
>> All this isn't thoroughly tested at all and rather crude, and there
>> should certainly be more error checking, but I think this is true for
>> almost all the rest of the app also, so it should be ok for the
>> beginning ;)
>>
>>>> changing the channel works, but I didn't manage to have the selection
>>>> changed to the new channel in the DvbChannelView tree. I don't know
>>>> how to
>>>> get a valid QModelIndex that points to the correct DvbChannelModel.
>>>> Please
>>>> look at the code and at my comments in DvbTab::setChannel(int
>>>> number). I
>>>> tried almost everything and thereby learned a lot about the model /
>>>> view
>>>> concept of Qt, but it didn't help me to find the solution... Maybe you
>>>> already know this probem Christoph, because there is the same issue
>>>> when
>>>> kaffeine gets started with the "--tv <channel>" flag: it simply calls
>>>> DvbTab::playChannel(const QString &name), but it does not select
>>>> the channel
>>>> in the DvbChannelView. The problem is that afterwards, calls to
>>>> MediaWidget::previous() and next() have no effect, because the
>>>> currently
>>>> selected channel is not known. I hope that someone more clever than
>>>> me will
>>>> solve this issue ;)
>>>
>>> Yes, this one is trickier. Note that there exists a similar problem
>>> e.g. with playPause(): you also need to update the ui state.
>>>
>> I now found a solution (although I don't know if it's the best), but
>> I don't recognize what should be updated when the playPause() method
>> is called, you have a better overview for sure...
>>
>> ciao,
>> Pascal
>>
>>
>> Christoph Pfister schrieb:
>>> Hi,
>>>
>>> 2009/11/6 Pascal Pollet <pascal@...>:
>>>
>>>> Hi,
>>>>
>>>> here is what I've done so far, I think it should add enough d-bus
>>>> to make
>>>> most users happy, including me :) Please look at it and tell me
>>>> what you
>>>> think of it...
>>>>
>>>
>>> It's a very good starting point. There exists a mediaplayer dbus
>>> specification MPRIS [1], which I consider worth to implement (so that
>>> we don't add yet another dbus interface for common functionality).
>>> I've committed preliminary support to svn (the "root" object). Could
>>> you please adapt your patch to that concept (i.e. add a tracklist and
>>> player object; in case of need just method stubs)? I'm aware of the
>>> fact that the actions defined in that specification don't 100% map
>>> Kaffeine's actions (e.g. Play() doing a rewind to the beginning of a
>>> track), so you don't have to care about those details if you don't
>>> want to do. I also know that not every mpris thing is possible
>>> (especially the tracklist parts needs more work) and that there's not
>>> a mpris thing for every action Kaffeine is able to perform (put them
>>> in a separate object for now).
>>>
>>>
>>>> There is one problem left, when selecting a new DVB-channel
>>>> directly by name
>>>> or by number, with the (new) functions:
>>>>
>>>> dvbTab::setChannel(const QString &name)
>>>> and
>>>> DvbTab::setChannel(int number)
>>>>
>>>> changing the channel works, but I didn't manage to have the selection
>>>> changed to the new channel in the DvbChannelView tree. I don't know
>>>> how to
>>>> get a valid QModelIndex that points to the correct DvbChannelModel.
>>>> Please
>>>> look at the code and at my comments in DvbTab::setChannel(int
>>>> number). I
>>>> tried almost everything and thereby learned a lot about the model /
>>>> view
>>>> concept of Qt, but it didn't help me to find the solution... Maybe you
>>>> already know this probem Christoph, because there is the same issue
>>>> when
>>>> kaffeine gets started with the "--tv <channel>" flag: it simply calls
>>>> DvbTab::playChannel(const QString &name), but it does not select
>>>> the channel
>>>> in the DvbChannelView. The problem is that afterwards, calls to
>>>> MediaWidget::previous() and next() have no effect, because the
>>>> currently
>>>> selected channel is not known. I hope that someone more clever than
>>>> me will
>>>> solve this issue ;)
>>>>
>>>
>>> Yes, this one is trickier. Note that there exists a similar problem
>>> e.g. with playPause(): you also need to update the ui state.
>>>
>>>
>>>> cheers,
>>>> Pascal
>>>>
>>>
>>> Thanks,
>>>
>>> Christoph
>>>
>>>
>>> [1] http://wiki.xmms2.xmms.se/wiki/MPRIS
>>>
>>>
>>

diff -Naur ../kaffeine/src/dbusobjects.cpp ./src/dbusobjects.cpp
--- ../kaffeine/src/dbusobjects.cpp 2009-11-23 11:06:04.000000000 +0100
+++ ./src/dbusobjects.cpp 2009-11-23 12:09:12.000000000 +0100
@@ -23,6 +23,9 @@
#include <QDBusMetaType>
#include <KAboutData>
#include <KApplication>
+#include <KUrl>
+
+#include "mediawidget.h"

QDBusArgument &operator<<(QDBusArgument &argument, const MprisVersionStruct &versionStruct)
{
@@ -40,9 +43,27 @@
return argument;
}

+QDBusArgument &operator<<(QDBusArgument &argument, const MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument << statusStruct.play << statusStruct.random << statusStruct.repeatTrack << statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument >> statusStruct.play >> statusStruct.random >> statusStruct.repeatTrack >> statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+
MprisRootObject::MprisRootObject(QObject *parent) : QObject(parent)
{
qDBusRegisterMetaType<MprisVersionStruct>();
+ qDBusRegisterMetaType<MprisStatusStruct>();
}

MprisRootObject::~MprisRootObject()
@@ -67,3 +88,325 @@
versionStruct.minor = 0;
return versionStruct;
}
+
+MprisPlayerObject::MprisPlayerObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisPlayerObject::~MprisPlayerObject()
+{ }
+
+void MprisPlayerObject::Next()
+{
+ mediaWidget->next();
+}
+
+void MprisPlayerObject::Prev()
+{
+ mediaWidget->previous();
+}
+
+void MprisPlayerObject::PlayPause()
+{
+ mediaWidget->playPause();
+}
+
+void MprisPlayerObject::Play()
+{
+ mediaWidget->play();
+}
+
+void MprisPlayerObject::Pause()
+{
+ mediaWidget->pause();
+}
+
+int MprisPlayerObject::VolumeGet()
+{
+ return mediaWidget->getVolume();
+}
+
+void MprisPlayerObject::VolumeSet(int volume)
+{
+ mediaWidget->changeVolume(volume);
+}
+
+void MprisPlayerObject::VolumeIncrease()
+{
+ mediaWidget->increaseVolume();
+}
+
+void MprisPlayerObject::VolumeDecrease()
+{
+ mediaWidget->decreaseVolume();
+}
+
+int MprisPlayerObject::PositionGet()
+{
+ return mediaWidget->getPosition();
+}
+
+
+void MprisPlayerObject::PositionSet(int position)
+{
+ mediaWidget->setPosition(position);
+}
+
+void MprisPlayerObject::Repeat()
+{
+ //TODO
+ //repeating a single track not implemented yet, only whole playlist
+}
+
+int MprisPlayerObject::GetCaps()
+{
+ int caps = NO_CAPS;
+
+ if ( mediaWidget->hasMedia() )
+ {
+ if ( mediaWidget->isPlaying() && ! mediaWidget->isPaused() )
+ {
+ caps |= CAN_PAUSE;
+ }
+ else
+ {
+ caps |= CAN_PLAY;
+ }
+ }
+
+ caps |= CAN_HAS_TRACKLIST;
+
+ //TODO: CAN_GO_NEXT & CAN_GO_PREV & CAN_PROVIDE_METADATA
+
+ return caps;
+}
+
+void MprisPlayerObject::Stop()
+{
+ mediaWidget->stop();
+}
+
+MprisStatusStruct MprisPlayerObject::GetStatus()
+{
+ MprisStatusStruct statusStruct;
+ if ( mediaWidget->isPaused() )
+ {
+ statusStruct.play = 1;
+ }
+ else if ( mediaWidget->isPlaying() )
+ {
+ statusStruct.play = 0;
+ }
+ else
+ {
+ statusStruct.play = 2;
+ }
+
+ if ( mediaWidget->isRepeat() )
+ {
+ statusStruct.repeatAll = 1;
+ }
+ else
+ {
+ statusStruct.repeatAll = 0;
+ }
+
+ statusStruct.random = 0;
+ statusStruct.repeatTrack = 0;
+
+ return statusStruct;
+}
+
+QVariantMap MprisPlayerObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+void MprisPlayerObject::Play(const QString &url)
+{
+ KUrl kurl(url);
+ if (kurl.isValid()) {
+ mediaWidget->play(kurl);
+ }
+}
+
+void MprisPlayerObject::PlayAudioCd()
+{
+ mediaWidget->playAudioCd();
+}
+
+void MprisPlayerObject::PlayVideoCd()
+{
+ mediaWidget->playVideoCd();
+}
+
+void MprisPlayerObject::PlayDvd()
+{
+ mediaWidget->playDvd();
+}
+
+void MprisPlayerObject::ChangeAudioChannel(int index)
+{
+ mediaWidget->changeAudioChannel(index);
+}
+
+void MprisPlayerObject::ChangeSubtitle(int index)
+{
+ mediaWidget->changeSubtitle(index);
+}
+
+void MprisPlayerObject::ToggleMuted()
+{
+ mediaWidget->toggleMuted();
+}
+
+void MprisPlayerObject::LongSkipBackward()
+{
+ mediaWidget->longSkipBackward();
+}
+
+void MprisPlayerObject::SkipBackward()
+{
+ mediaWidget->skipBackward();
+}
+
+void MprisPlayerObject::SkipForward()
+{
+ mediaWidget->skipForward();
+}
+
+void MprisPlayerObject::LongSkipForward()
+{
+ mediaWidget->longSkipForward();
+}
+
+void MprisPlayerObject::TimeButtonClicked()
+{
+ mediaWidget->timeButtonClicked();
+}
+
+void MprisPlayerObject::UpdateTimeButton()
+{
+ mediaWidget->updateTimeButton();
+}
+
+
+MprisTrackListObject::MprisTrackListObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisTrackListObject::~MprisTrackListObject()
+{ }
+
+QVariantMap MprisTrackListObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+int MprisTrackListObject::GetCurrentTrack()
+{
+ return mediaWidget->getCurrentTrack();
+}
+
+int MprisTrackListObject::GetLength()
+{
+ return mediaWidget->getLength();
+}
+
+int MprisTrackListObject::AddTrack(QString track, bool play)
+{
+ return mediaWidget->addTrack(track, play);
+}
+
+void MprisTrackListObject::DelTrack(int position)
+{
+ mediaWidget->delTrack(position);
+}
+
+void MprisTrackListObject::SetLoop(bool loop)
+{
+ mediaWidget->setLoop(loop);
+}
+
+void MprisTrackListObject::SetRandom(bool random)
+{
+ mediaWidget->setRandom(random);
+}
+
+
+
+MprisDvbObject::MprisDvbObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDvbObject::~MprisDvbObject()
+{ }
+
+void MprisDvbObject::SetDvbChannel(const QString &name)
+{
+ mediaWidget->setDvbChannel(name);
+}
+
+void MprisDvbObject::SetDvbChannelNumber(int number)
+{
+ mediaWidget->setDvbChannel(number);
+}
+
+void MprisDvbObject::SetNumber(int number)
+{
+ mediaWidget->setNumber(number);
+}
+
+void MprisDvbObject::SetDvbLastChannel()
+{
+ mediaWidget->setDvbLastChannel();
+}
+
+void MprisDvbObject::StopDvb()
+{
+ mediaWidget->stopDvb();
+}
+
+void MprisDvbObject::ToggleInstantRecord()
+{
+ mediaWidget->toggleInstantRecord();
+}
+
+void MprisDvbObject::ToggleOsd()
+{
+ mediaWidget->toggleOsd();
+}
+
+
+
+MprisDisplayObject::MprisDisplayObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDisplayObject::~MprisDisplayObject()
+{ }
+
+void MprisDisplayObject::ToggleFullScreen()
+{
+ mediaWidget->fullScreen();
+}
+
+void MprisDisplayObject::AspectRatioAuto()
+{
+ mediaWidget->aspectRatioAuto();
+}
+
+void MprisDisplayObject::AspectRatio4_3()
+{
+ mediaWidget->aspectRatio4_3();
+}
+
+void MprisDisplayObject::AspectRatio16_9()
+{
+ mediaWidget->aspectRatio16_9();
+}
+
+void MprisDisplayObject::AspectRatioWidget()
+{
+ mediaWidget->aspectRatioWidget();
+}
+
+
+
+
diff -Naur ../kaffeine/src/dbusobjects.h ./src/dbusobjects.h
--- ../kaffeine/src/dbusobjects.h 2009-11-23 11:06:04.000000000 +0100
+++ ./src/dbusobjects.h 2009-11-23 12:09:12.000000000 +0100
@@ -22,8 +22,12 @@
#define DBUSOBJECTS_H

#include <QMetaType>
+#include <QVariantMap>

struct MprisVersionStruct;
+struct MprisStatusStruct;
+
+class MediaWidget;

class MprisRootObject : public QObject
{
@@ -39,6 +43,130 @@
MprisVersionStruct MprisVersion();
};

+
+class MprisPlayerObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisPlayerObject(MediaWidget *mediaWidget_);
+ ~MprisPlayerObject();
+
+public slots:
+ void Next();
+ void Prev();
+ void Play();
+ void Pause();
+ void Stop();
+ int VolumeGet();
+ void VolumeSet(int volume);
+ int PositionGet();
+ void PositionSet(int position);
+ void Repeat();
+ MprisStatusStruct GetStatus();
+ QVariantMap GetMetadata();
+ int GetCaps();
+
+ // this functions are not part of the MPRIS specs
+ void PlayPause();
+ void VolumeIncrease();
+ void VolumeDecrease();
+ void Play(const QString &url);
+ void PlayAudioCd();
+ void PlayVideoCd();
+ void PlayDvd();
+ void ChangeAudioChannel(int index);
+ void ChangeSubtitle(int index);
+ void ToggleMuted();
+ void LongSkipBackward();
+ void SkipBackward();
+ void SkipForward();
+ void LongSkipForward();
+ void TimeButtonClicked();
+ void UpdateTimeButton();
+
+signals:
+ void CapsChange( int );
+ void StatusChange( MprisStatusStruct );
+ void TrackChange( QVariantMap );
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisTrackListObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisTrackListObject(MediaWidget *mediaWidget_);
+ ~MprisTrackListObject();
+
+public slots:
+ QVariantMap GetMetadata();
+ int GetCurrentTrack();
+ int GetLength();
+ int AddTrack(QString track, bool play);
+ void DelTrack(int position);
+ void SetLoop(bool loop);
+ void SetRandom(bool random);
+
+signals:
+ void TrackListChange(int);
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDvbObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDvbObject(MediaWidget *mediaWidget_);
+ ~MprisDvbObject();
+
+public slots:
+ void SetDvbChannel(const QString &name);
+ void SetDvbChannelNumber(int number);
+ void SetNumber(int number);
+ void SetDvbLastChannel();
+ void StopDvb();
+ void ToggleInstantRecord();
+ void ToggleOsd();
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDisplayObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDisplayObject(MediaWidget *mediaWidget_);
+ ~MprisDisplayObject();
+
+public slots:
+ void AspectRatioAuto();
+ void AspectRatio4_3();
+ void AspectRatio16_9();
+ void AspectRatioWidget();
+ void ToggleFullScreen();
+
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
struct MprisVersionStruct
{
quint16 major;
@@ -47,4 +175,30 @@

Q_DECLARE_METATYPE(MprisVersionStruct)

+struct MprisStatusStruct
+{
+ quint16 play;
+ quint16 random;
+ quint16 repeatTrack;
+ quint16 repeatAll;
+};
+
+Q_DECLARE_METATYPE(MprisStatusStruct)
+
+/**
+* The bit values for the capabilities flags
+*/
+enum Cap {
+ NO_CAPS = 0,
+ CAN_GO_NEXT = 1 << 0,
+ CAN_GO_PREV = 1 << 1,
+ CAN_PAUSE = 1 << 2,
+ CAN_PLAY = 1 << 3,
+ CAN_SEEK = 1 << 4,
+ CAN_PROVIDE_METADATA = 1 << 5,
+ CAN_HAS_TRACKLIST = 1 << 6,
+ ALL_KNOWN_CAPS = (1 << 7) - 1
+};
+Q_DECLARE_FLAGS(Caps, Cap)
+
#endif /* DBUSOBJECTS_H */
diff -Naur ../kaffeine/src/dvb/dvbtab.cpp ./src/dvb/dvbtab.cpp
--- ../kaffeine/src/dvb/dvbtab.cpp 2009-11-23 11:06:03.000000000 +0100
+++ ./src/dvb/dvbtab.cpp 2009-11-23 12:09:12.000000000 +0100
@@ -117,6 +117,10 @@

connect(mediaWidget, SIGNAL(previousDvbChannel()), this, SLOT(previousChannel()));
connect(mediaWidget, SIGNAL(nextDvbChannel()), this, SLOT(nextChannel()));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(const QString&)), this, SLOT(setChannel(const QString&)));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(int)), this, SLOT(setChannel(int)));
+ connect(mediaWidget, SIGNAL(dvbLastChannel()), this, SLOT(setLastChannel()));
+ connect(mediaWidget, SIGNAL(toggleInstantRecord()), this, SLOT(toggleInstantRecord()));

connect(manager->getRecordingManager(), SIGNAL(instantRecordingRemoved()),
this, SLOT(instantRecordingRemoved()));
@@ -144,7 +148,7 @@
channelView->setRootIsDecorated(false);

if (!channelView->header()->restoreState(QByteArray::fromBase64(
- KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
+ KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
channelView->sortByColumn(0, Qt::AscendingOrder);
}

@@ -210,6 +214,11 @@
playChannel(manager->getChannelModel()->channelForName(name));
}

+void DvbTab::playChannel(int number)
+{
+ playChannel(manager->getChannelModel()->channelForNumber(number));
+}
+
void DvbTab::playLastChannel()
{
playChannel(KGlobal::config()->group("DVB").readEntry("LastChannel"));
@@ -244,6 +253,19 @@
dialog.exec();
}

+void DvbTab::toggleInstantRecord()
+{
+ if (instantRecordAction->isChecked()) {
+ instantRecordAction->setChecked(false);
+ instantRecord(false);
+ }
+ else {
+ instantRecordAction->setChecked(true);
+ instantRecord(true);
+ }
+}
+
+
void DvbTab::instantRecord(bool checked)
{
if (checked) {
@@ -351,4 +373,73 @@
if (channel != NULL) {
manager->getLiveView()->playChannel(channel);
}
+
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 0), Qt::DisplayRole, channel->name, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+
}
+
+void DvbTab::setChannel(const QString &name)
+{
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 0), Qt::DisplayRole, name, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+
+ playChannel(name);
+}
+
+void DvbTab::setChannel(int number)
+{
+
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 1), Qt::DisplayRole, number, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+ playChannel(number);
+
+}
+
+void DvbTab::setLastChannel()
+{
+ playLastChannel();
+}
+
diff -Naur ../kaffeine/src/dvb/dvbtab.h ./src/dvb/dvbtab.h
--- ../kaffeine/src/dvb/dvbtab.h 2009-11-23 11:06:02.000000000 +0100
+++ ./src/dvb/dvbtab.h 2009-11-23 12:09:12.000000000 +0100
@@ -38,11 +38,13 @@
class DvbTab : public TabBase
{
Q_OBJECT
+
public:
DvbTab(KMenu *menu, KActionCollection *collection, MediaWidget *mediaWidget_);
~DvbTab();

void playChannel(const QString &name);
+ void playChannel(int number);
void playLastChannel();

void enableDvbDump();
@@ -52,12 +54,16 @@
void showEpgDialog();
void showRecordingDialog();
void instantRecord(bool checked);
+ void toggleInstantRecord();
void instantRecordingRemoved();
void configureDvb();
void playLive(const QModelIndex &index);
void previousChannel();
void nextChannel();
void cleanTimeShiftFiles();
+ void setChannel(const QString &name);
+ void setChannel(int number);
+ void setLastChannel();

private:
void activate();
diff -Naur ../kaffeine/src/kaffeine.cpp ./src/kaffeine.cpp
--- ../kaffeine/src/kaffeine.cpp 2009-11-23 11:06:04.000000000 +0100
+++ ./src/kaffeine.cpp 2009-11-23 12:09:12.000000000 +0100
@@ -327,6 +327,15 @@
// initialize dbus objects
QDBusConnection::sessionBus().registerObject("/", new MprisRootObject(this),
QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Player", new MprisPlayerObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/TrackList", new MprisTrackListObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/DVB", new MprisDvbObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Display", new MprisDisplayObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+
QDBusConnection::sessionBus().registerService("org.mpris.kaffeine");

show();
diff -Naur ../kaffeine/src/mediawidget.cpp ./src/mediawidget.cpp
--- ../kaffeine/src/mediawidget.cpp 2009-11-23 11:06:02.000000000 +0100
+++ ./src/mediawidget.cpp 2009-11-23 12:09:12.000000000 +0100
@@ -374,6 +374,8 @@
connect(timer, SIGNAL(timeout()), this, SLOT(checkScreenSaver()));

stateChanged(Phonon::StoppedState);
+
+ setRepeat(false);
}

MediaWidget::~MediaWidget()
@@ -543,6 +545,67 @@
}
}

+bool MediaWidget::isPaused()
+{
+ if (playing && mediaObject->state() == Phonon::PausedState)
+ {
+ return true;
+ }
+ return false;
+}
+
+// also returns true when paused
+bool MediaWidget::isPlaying()
+{
+ return playing;
+}
+
+void MediaWidget::setRepeat(bool repeat_)
+{
+ repeat = repeat_;
+}
+
+bool MediaWidget::isRepeat()
+{
+ return repeat;
+}
+
+bool MediaWidget::hasMedia()
+{
+ if ( mediaObject->currentSource().type() != Phonon::MediaSource::Invalid ) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+void MediaWidget::setDvbChannel(int number)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(number);
+ }
+}
+
+void MediaWidget::setDvbChannel(const QString &name)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(name);
+ }
+}
+
+void MediaWidget::setDvbLastChannel()
+{
+ if (dvbFeed != NULL) {
+ emit dvbLastChannel();
+ }
+}
+
+void MediaWidget::fullScreen()
+{
+ emit toggleFullScreen();
+}
+
void MediaWidget::stateChanged(Phonon::State state)
{
bool newPlaying = false;
@@ -551,6 +614,7 @@
case Phonon::BufferingState:
case Phonon::PlayingState:
case Phonon::PausedState:
+ paused = true;
newPlaying = true;
break;

@@ -655,6 +719,31 @@
}
}

+void MediaWidget::playPause() {
+ //if (actionPlayPause->text() == textPlay) {
+ if (isPaused()) {
+ playPause(false);
+ }
+ else {
+ playPause(true);
+ }
+}
+
+void MediaWidget::play() {
+ if (playing && actionPlayPause->text() == textPlay) {
+ playPause(false);
+ }
+ else if (!playing) {
+ emit playlistPlay();
+ }
+}
+
+void MediaWidget::pause() {
+ if (playing && actionPlayPause->text() == textPause) {
+ playPause(true);
+ }
+}
+
void MediaWidget::stop()
{
mediaObject->stop();
@@ -726,6 +815,17 @@
}
}

+int MediaWidget::getVolume()
+{
+ int volume = audioOutput->volume() * 100;
+
+ if ( volume >= 0 && volume <= 100 ) {
+ return volume;
+ }
+
+ return 0;
+}
+
void MediaWidget::changeVolume(int volume)
{
audioOutput->setVolume(volume * qreal(0.01));
@@ -915,6 +1015,16 @@
mediaObject->seek(mediaObject->currentTime() + 1000 * longSkipDuration);
}

+void MediaWidget::setPosition(int position)
+{
+ mediaObject->seek(position);
+}
+
+int MediaWidget::getPosition()
+{
+ return mediaObject->currentTime();
+}
+
void MediaWidget::jumpToPosition()
{
JumpToPositionDialog dialog(QTime().addMSecs(mediaObject->currentTime()), this);
@@ -1150,3 +1260,64 @@
subtitleBox->setEnabled(false);
}
}
+
+QVariantMap MediaWidget::getMetadata()
+{
+ QVariantMap ret;
+ QMultiMap<QString, QString> multiMap = mediaObject->metaData();
+ QMultiMap<QString, QString>::const_iterator i = multiMap.constBegin();
+
+ while( i != multiMap.constEnd() )
+ {
+ ret[ i.key() ] = QVariant( i.value() );
+ i++;
+ }
+ return ret;
+}
+
+int getNumberOfTracks()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getCurrentTrack()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getLength()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::addTrack(QString track, bool play)
+{
+ //TODO
+ return 0;
+}
+
+void MediaWidget::delTrack(int position)
+{
+ //TODO
+}
+
+void MediaWidget::setLoop(bool loop)
+{
+ setRepeat(loop);
+}
+
+void MediaWidget::setRandom(bool random)
+{
+ //TODO
+}
+
+void MediaWidget::setNumber(int number)
+{
+ if (number >= 0 && number <= 9) {
+ emit osdKeyPressed(number + Qt::Key_0);
+ }
+}
+
diff -Naur ../kaffeine/src/mediawidget.h ./src/mediawidget.h
--- ../kaffeine/src/mediawidget.h 2009-11-23 11:06:03.000000000 +0100
+++ ./src/mediawidget.h 2009-11-23 12:09:12.000000000 +0100
@@ -48,9 +48,14 @@
class MediaWidget : public QWidget
{
Q_OBJECT
+ friend class MprisPlayerObject;
+ friend class MprisTrackListObject;
+ friend class MprisDvbObject;
+ friend class MprisDisplayObject;
+
public:
MediaWidget(KMenu *menu_, KAction *fullScreenAction, KToolBar *toolBar,
- KActionCollection *collection, QWidget *parent);
+ KActionCollection *collection, QWidget *parent);
~MediaWidget();

static QString extensionFilter(); // usable for KFileDialog::setFilter()
@@ -78,6 +83,12 @@
void setShortSkipDuration(int duration);
void setLongSkipDuration(int duration);

+ void setRepeat(bool repeat_);
+ bool isRepeat();
+ bool hasMedia();
+
+ void setNumber(int number);
+
public slots:
void stop();
void stopDvb();
@@ -98,14 +109,35 @@
void startDvbTimeShift();
void changeDvbAudioChannel(int index);
void changeDvbSubtitle(int index);
+ void changeDvbChannel(int number);
+ void changeDvbChannel(const QString &name);
void dvbStopped();
void osdKeyPressed(int key);
+ void toggleOsd();
+
+ void dvbLastChannel();
+ void toggleInstantRecord();
+

private slots:
+ bool isPlaying();
+ bool isPaused();
+
+ int getPosition();
+ int getCurrentTrack();
+ int getLength();
+ int addTrack(QString track, bool play);
+ int getVolume();
+
+ QVariantMap getMetadata();
+
void stateChanged(Phonon::State state);
void playbackFinished();
void previous();
void playPause(bool paused);
+ void playPause();
+ void play();
+ void pause();
void next();
void changeAudioChannel(int index);
void changeSubtitle(int index);
@@ -132,6 +164,7 @@
void skipForward();
void longSkipForward();
void jumpToPosition();
+ void setPosition(int position);
void timeButtonClicked();
void updateTimeButton();
void updateCaption();
@@ -144,6 +177,17 @@

void checkScreenSaver();

+ void setDvbChannel(int number);
+ void setDvbChannel(const QString &name);
+ void setDvbLastChannel();
+
+ void fullScreen();
+
+ void delTrack(int position);
+ void setLoop(bool loop);
+ void setRandom(bool random);
+
+
private:
void contextMenuEvent(QContextMenuEvent *event);
void mouseDoubleClickEvent(QMouseEvent *);
@@ -164,6 +208,7 @@
Phonon::MediaController *mediaController;
DvbFeed *dvbFeed;
bool playing;
+ bool paused;

KAction *actionPrevious;
KAction *actionPlayPause;
@@ -204,6 +249,8 @@
KAction *jumpToPositionAction;
QPushButton *timeButton;
bool showElapsedTime;
+ bool repeat;
+ int inputNumber;
};

#endif /* MEDIAWIDGET_H */
diff -Naur ../kaffeine/src/playlist/playlistmodel.cpp ./src/playlist/playlistmodel.cpp
--- ../kaffeine/src/playlist/playlistmodel.cpp 2009-11-23 11:06:03.000000000 +0100
+++ ./src/playlist/playlistmodel.cpp 2009-11-23 12:09:12.000000000 +0100
@@ -48,6 +48,7 @@
QAbstractTableModel(parent), mediaWidget(mediaWidget_), repeat(false)
{
setSupportedDragActions(Qt::MoveAction);
+ mediaWidget->setRepeat(false);

connect(mediaWidget, SIGNAL(playlistPrevious()), this, SLOT(playPreviousTrack()));
connect(mediaWidget, SIGNAL(playlistPlay()), this, SLOT(playCurrentTrack()));
@@ -351,6 +352,7 @@
void PlaylistModel::repeatPlaylist(bool repeat_)
{
repeat = repeat_;
+ mediaWidget->setRepeat(repeat);
}

static bool playlistIndexLess(const PlaylistTrack &x, const PlaylistTrack &y)

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: dbus support for kaffeine

2009-11-23T02:43:09Z

Hi,

I now added the SetNumber(int) function to enter numbers with multiple
digits, that was really easy, as the code to enter numbers with the
keyboard was already there. I didn't notice it before because there is
one problem left with this code: entering numbers with the keyboard has
no effect if the DvbChannelView has the focus, in this case you have to
click into the picture before to make it work. Number-key events in the
DvbChannelView should maybe be redirected somehow to the MediaWidget
class...

I also removed some debugging code that was still present in my last
patch, sorry...

The patch is against the actual svn trunk again (revision 1053111)

ciao,
Pascal

Pascal schrieb:

> Hi,
>
> ok, here is the actual state of things. The mpris methods are all
> implemented, with a few stubs left: a few /TrackList methods still
> need to be implemented, but I will try to do it soon. The /Player
> Repeat() function is also a stub, because the playlist does not allow
> to repeat a single track yet. Also the GetCaps () function is incomplete.
>
> I put much methods into the /Player object which are not part of the
> mpris specs, because it wouldn't make much sense to make a separate
> object for them. I think it should be ok, but if you don't agree,
> please tell me, it' not difficult to change...
>
> I made a DVB/ object for dvb-related stuff and a Display/ object for
> methods like toggleFullScreen, I'm not sure if "Display" is the best
> name for that...
>
> There is still a need for a method that allows to enter channel
> numbers with more than one digit with a remote control (or with the
> keyboard), I will try to do this in the next time, as for me it's the
> most important feature which is still missing.
>
> I changed all dbus functions to begin with a capital letter, to be
> consistent with the mpris methods.
>
> All this isn't thoroughly tested at all and rather crude, and there
> should certainly be more error checking, but I think this is true for
> almost all the rest of the app also, so it should be ok for the
> beginning ;)
>
>>> changing the channel works, but I didn't manage to have the selection
>>> changed to the new channel in the DvbChannelView tree. I don't know
>>> how to
>>> get a valid QModelIndex that points to the correct DvbChannelModel.
>>> Please
>>> look at the code and at my comments in DvbTab::setChannel(int
>>> number). I
>>> tried almost everything and thereby learned a lot about the model /
>>> view
>>> concept of Qt, but it didn't help me to find the solution... Maybe you
>>> already know this probem Christoph, because there is the same issue
>>> when
>>> kaffeine gets started with the "--tv <channel>" flag: it simply calls
>>> DvbTab::playChannel(const QString &name), but it does not select the
>>> channel
>>> in the DvbChannelView. The problem is that afterwards, calls to
>>> MediaWidget::previous() and next() have no effect, because the
>>> currently
>>> selected channel is not known. I hope that someone more clever than
>>> me will
>>> solve this issue ;)
>>
>> Yes, this one is trickier. Note that there exists a similar problem
>> e.g. with playPause(): you also need to update the ui state.
>>
> I now found a solution (although I don't know if it's the best), but I
> don't recognize what should be updated when the playPause() method is
> called, you have a better overview for sure...
>
> ciao,
> Pascal
>
>
> Christoph Pfister schrieb:
>> Hi,
>>
>> 2009/11/6 Pascal Pollet <pascal@...>:
>>
>>> Hi,
>>>
>>> here is what I've done so far, I think it should add enough d-bus to
>>> make
>>> most users happy, including me :) Please look at it and tell me what
>>> you
>>> think of it...
>>>
>>
>> It's a very good starting point. There exists a mediaplayer dbus
>> specification MPRIS [1], which I consider worth to implement (so that
>> we don't add yet another dbus interface for common functionality).
>> I've committed preliminary support to svn (the "root" object). Could
>> you please adapt your patch to that concept (i.e. add a tracklist and
>> player object; in case of need just method stubs)? I'm aware of the
>> fact that the actions defined in that specification don't 100% map
>> Kaffeine's actions (e.g. Play() doing a rewind to the beginning of a
>> track), so you don't have to care about those details if you don't
>> want to do. I also know that not every mpris thing is possible
>> (especially the tracklist parts needs more work) and that there's not
>> a mpris thing for every action Kaffeine is able to perform (put them
>> in a separate object for now).
>>
>>
>>> There is one problem left, when selecting a new DVB-channel directly
>>> by name
>>> or by number, with the (new) functions:
>>>
>>> dvbTab::setChannel(const QString &name)
>>> and
>>> DvbTab::setChannel(int number)
>>>
>>> changing the channel works, but I didn't manage to have the selection
>>> changed to the new channel in the DvbChannelView tree. I don't know
>>> how to
>>> get a valid QModelIndex that points to the correct DvbChannelModel.
>>> Please
>>> look at the code and at my comments in DvbTab::setChannel(int
>>> number). I
>>> tried almost everything and thereby learned a lot about the model /
>>> view
>>> concept of Qt, but it didn't help me to find the solution... Maybe you
>>> already know this probem Christoph, because there is the same issue
>>> when
>>> kaffeine gets started with the "--tv <channel>" flag: it simply calls
>>> DvbTab::playChannel(const QString &name), but it does not select the
>>> channel
>>> in the DvbChannelView. The problem is that afterwards, calls to
>>> MediaWidget::previous() and next() have no effect, because the
>>> currently
>>> selected channel is not known. I hope that someone more clever than
>>> me will
>>> solve this issue ;)
>>>
>>
>> Yes, this one is trickier. Note that there exists a similar problem
>> e.g. with playPause(): you also need to update the ui state.
>>
>>
>>> cheers,
>>> Pascal
>>>
>>
>> Thanks,
>>
>> Christoph
>>
>>
>> [1] http://wiki.xmms2.xmms.se/wiki/MPRIS
>>
>>
>

diff -Naur ../kaffeine/src/dbusobjects.cpp ./src/dbusobjects.cpp
--- ../kaffeine/src/dbusobjects.cpp 2009-11-23 11:06:04.000000000 +0100
+++ ./src/dbusobjects.cpp 2009-11-23 11:18:25.000000000 +0100
@@ -23,6 +23,9 @@
#include <QDBusMetaType>
#include <KAboutData>
#include <KApplication>
+#include <KUrl>
+
+#include "mediawidget.h"

QDBusArgument &operator<<(QDBusArgument &argument, const MprisVersionStruct &versionStruct)
{
@@ -40,9 +43,27 @@
return argument;
}

+QDBusArgument &operator<<(QDBusArgument &argument, const MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument << statusStruct.play << statusStruct.random << statusStruct.repeatTrack << statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument >> statusStruct.play >> statusStruct.random >> statusStruct.repeatTrack >> statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+
MprisRootObject::MprisRootObject(QObject *parent) : QObject(parent)
{
qDBusRegisterMetaType<MprisVersionStruct>();
+ qDBusRegisterMetaType<MprisStatusStruct>();
}

MprisRootObject::~MprisRootObject()
@@ -67,3 +88,325 @@
versionStruct.minor = 0;
return versionStruct;
}
+
+MprisPlayerObject::MprisPlayerObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisPlayerObject::~MprisPlayerObject()
+{ }
+
+void MprisPlayerObject::Next()
+{
+ mediaWidget->next();
+}
+
+void MprisPlayerObject::Prev()
+{
+ mediaWidget->previous();
+}
+
+void MprisPlayerObject::PlayPause()
+{
+ mediaWidget->playPause();
+}
+
+void MprisPlayerObject::Play()
+{
+ mediaWidget->play();
+}
+
+void MprisPlayerObject::Pause()
+{
+ mediaWidget->pause();
+}
+
+int MprisPlayerObject::VolumeGet()
+{
+ return mediaWidget->getVolume();
+}
+
+void MprisPlayerObject::VolumeSet(int volume)
+{
+ mediaWidget->changeVolume(volume);
+}
+
+void MprisPlayerObject::VolumeIncrease()
+{
+ mediaWidget->increaseVolume();
+}
+
+void MprisPlayerObject::VolumeDecrease()
+{
+ mediaWidget->decreaseVolume();
+}
+
+int MprisPlayerObject::PositionGet()
+{
+ return mediaWidget->getPosition();
+}
+
+
+void MprisPlayerObject::PositionSet(int position)
+{
+ mediaWidget->setPosition(position);
+}
+
+void MprisPlayerObject::Repeat()
+{
+ //TODO
+ //repeating a single track not implemented yet, only whole playlist
+}
+
+int MprisPlayerObject::GetCaps()
+{
+ int caps = NO_CAPS;
+
+ if ( mediaWidget->hasMedia() )
+ {
+ if ( mediaWidget->isPlaying() && ! mediaWidget->isPaused() )
+ {
+ caps |= CAN_PAUSE;
+ }
+ else
+ {
+ caps |= CAN_PLAY;
+ }
+ }
+
+ caps |= CAN_HAS_TRACKLIST;
+
+ //TODO: CAN_GO_NEXT & CAN_GO_PREV & CAN_PROVIDE_METADATA
+
+ return caps;
+}
+
+void MprisPlayerObject::Stop()
+{
+ mediaWidget->stop();
+}
+
+MprisStatusStruct MprisPlayerObject::GetStatus()
+{
+ MprisStatusStruct statusStruct;
+ if ( mediaWidget->isPaused() )
+ {
+ statusStruct.play = 1;
+ }
+ else if ( mediaWidget->isPlaying() )
+ {
+ statusStruct.play = 0;
+ }
+ else
+ {
+ statusStruct.play = 2;
+ }
+
+ if ( mediaWidget->isRepeat() )
+ {
+ statusStruct.repeatAll = 1;
+ }
+ else
+ {
+ statusStruct.repeatAll = 0;
+ }
+
+ statusStruct.random = 0;
+ statusStruct.repeatTrack = 0;
+
+ return statusStruct;
+}
+
+QVariantMap MprisPlayerObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+void MprisPlayerObject::Play(const QString &url)
+{
+ KUrl kurl(url);
+ if (kurl.isValid()) {
+ mediaWidget->play(kurl);
+ }
+}
+
+void MprisPlayerObject::PlayAudioCd()
+{
+ mediaWidget->playAudioCd();
+}
+
+void MprisPlayerObject::PlayVideoCd()
+{
+ mediaWidget->playVideoCd();
+}
+
+void MprisPlayerObject::PlayDvd()
+{
+ mediaWidget->playDvd();
+}
+
+void MprisPlayerObject::ChangeAudioChannel(int index)
+{
+ mediaWidget->changeAudioChannel(index);
+}
+
+void MprisPlayerObject::ChangeSubtitle(int index)
+{
+ mediaWidget->changeSubtitle(index);
+}
+
+void MprisPlayerObject::ToggleMuted()
+{
+ mediaWidget->toggleMuted();
+}
+
+void MprisPlayerObject::LongSkipBackward()
+{
+ mediaWidget->longSkipBackward();
+}
+
+void MprisPlayerObject::SkipBackward()
+{
+ mediaWidget->skipBackward();
+}
+
+void MprisPlayerObject::SkipForward()
+{
+ mediaWidget->skipForward();
+}
+
+void MprisPlayerObject::LongSkipForward()
+{
+ mediaWidget->longSkipForward();
+}
+
+void MprisPlayerObject::TimeButtonClicked()
+{
+ mediaWidget->timeButtonClicked();
+}
+
+void MprisPlayerObject::UpdateTimeButton()
+{
+ mediaWidget->updateTimeButton();
+}
+
+
+MprisTrackListObject::MprisTrackListObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisTrackListObject::~MprisTrackListObject()
+{ }
+
+QVariantMap MprisTrackListObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+int MprisTrackListObject::GetCurrentTrack()
+{
+ return mediaWidget->getCurrentTrack();
+}
+
+int MprisTrackListObject::GetLength()
+{
+ return mediaWidget->getLength();
+}
+
+int MprisTrackListObject::AddTrack(QString track, bool play)
+{
+ return mediaWidget->addTrack(track, play);
+}
+
+void MprisTrackListObject::DelTrack(int position)
+{
+ mediaWidget->delTrack(position);
+}
+
+void MprisTrackListObject::SetLoop(bool loop)
+{
+ mediaWidget->setLoop(loop);
+}
+
+void MprisTrackListObject::SetRandom(bool random)
+{
+ mediaWidget->setRandom(random);
+}
+
+
+
+MprisDvbObject::MprisDvbObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDvbObject::~MprisDvbObject()
+{ }
+
+void MprisDvbObject::SetDvbChannel(const QString &name)
+{
+ mediaWidget->setDvbChannel(name);
+}
+
+void MprisDvbObject::SetDvbChannelNumber(int number)
+{
+ mediaWidget->setDvbChannel(number);
+}
+
+void MprisDvbObject::SetNumber(int number)
+{
+ mediaWidget->setNumber(number);
+}
+
+void MprisDvbObject::SetDvbLastChannel()
+{
+ mediaWidget->setDvbLastChannel();
+}
+
+void MprisDvbObject::StopDvb()
+{
+ mediaWidget->stopDvb();
+}
+
+void MprisDvbObject::ToggleInstantRecord()
+{
+ mediaWidget->toggleInstantRecord();
+}
+
+void MprisDvbObject::ToggleOsd()
+{
+ mediaWidget->toggleOsd();
+}
+
+
+
+MprisDisplayObject::MprisDisplayObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDisplayObject::~MprisDisplayObject()
+{ }
+
+void MprisDisplayObject::ToggleFullScreen()
+{
+ mediaWidget->fullScreen();
+}
+
+void MprisDisplayObject::AspectRatioAuto()
+{
+ mediaWidget->aspectRatioAuto();
+}
+
+void MprisDisplayObject::AspectRatio4_3()
+{
+ mediaWidget->aspectRatio4_3();
+}
+
+void MprisDisplayObject::AspectRatio16_9()
+{
+ mediaWidget->aspectRatio16_9();
+}
+
+void MprisDisplayObject::AspectRatioWidget()
+{
+ mediaWidget->aspectRatioWidget();
+}
+
+
+
+
diff -Naur ../kaffeine/src/dbusobjects.h ./src/dbusobjects.h
--- ../kaffeine/src/dbusobjects.h 2009-11-23 11:06:04.000000000 +0100
+++ ./src/dbusobjects.h 2009-11-23 11:18:25.000000000 +0100
@@ -22,8 +22,12 @@
#define DBUSOBJECTS_H

#include <QMetaType>
+#include <QVariantMap>

struct MprisVersionStruct;
+struct MprisStatusStruct;
+
+class MediaWidget;

class MprisRootObject : public QObject
{
@@ -39,6 +43,130 @@
MprisVersionStruct MprisVersion();
};

+
+class MprisPlayerObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisPlayerObject(MediaWidget *mediaWidget_);
+ ~MprisPlayerObject();
+
+public slots:
+ void Next();
+ void Prev();
+ void Play();
+ void Pause();
+ void Stop();
+ int VolumeGet();
+ void VolumeSet(int volume);
+ int PositionGet();
+ void PositionSet(int position);
+ void Repeat();
+ MprisStatusStruct GetStatus();
+ QVariantMap GetMetadata();
+ int GetCaps();
+
+ // this functions are not part of the MPRIS specs
+ void PlayPause();
+ void VolumeIncrease();
+ void VolumeDecrease();
+ void Play(const QString &url);
+ void PlayAudioCd();
+ void PlayVideoCd();
+ void PlayDvd();
+ void ChangeAudioChannel(int index);
+ void ChangeSubtitle(int index);
+ void ToggleMuted();
+ void LongSkipBackward();
+ void SkipBackward();
+ void SkipForward();
+ void LongSkipForward();
+ void TimeButtonClicked();
+ void UpdateTimeButton();
+
+signals:
+ void CapsChange( int );
+ void StatusChange( MprisStatusStruct );
+ void TrackChange( QVariantMap );
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisTrackListObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisTrackListObject(MediaWidget *mediaWidget_);
+ ~MprisTrackListObject();
+
+public slots:
+ QVariantMap GetMetadata();
+ int GetCurrentTrack();
+ int GetLength();
+ int AddTrack(QString track, bool play);
+ void DelTrack(int position);
+ void SetLoop(bool loop);
+ void SetRandom(bool random);
+
+signals:
+ void TrackListChange(int);
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDvbObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDvbObject(MediaWidget *mediaWidget_);
+ ~MprisDvbObject();
+
+public slots:
+ void SetDvbChannel(const QString &name);
+ void SetDvbChannelNumber(int number);
+ void SetNumber(int number);
+ void SetDvbLastChannel();
+ void StopDvb();
+ void ToggleInstantRecord();
+ void ToggleOsd();
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDisplayObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDisplayObject(MediaWidget *mediaWidget_);
+ ~MprisDisplayObject();
+
+public slots:
+ void AspectRatioAuto();
+ void AspectRatio4_3();
+ void AspectRatio16_9();
+ void AspectRatioWidget();
+ void ToggleFullScreen();
+
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
struct MprisVersionStruct
{
quint16 major;
@@ -47,4 +175,30 @@

Q_DECLARE_METATYPE(MprisVersionStruct)

+struct MprisStatusStruct
+{
+ quint16 play;
+ quint16 random;
+ quint16 repeatTrack;
+ quint16 repeatAll;
+};
+
+Q_DECLARE_METATYPE(MprisStatusStruct)
+
+/**
+* The bit values for the capabilities flags
+*/
+enum Cap {
+ NO_CAPS = 0,
+ CAN_GO_NEXT = 1 << 0,
+ CAN_GO_PREV = 1 << 1,
+ CAN_PAUSE = 1 << 2,
+ CAN_PLAY = 1 << 3,
+ CAN_SEEK = 1 << 4,
+ CAN_PROVIDE_METADATA = 1 << 5,
+ CAN_HAS_TRACKLIST = 1 << 6,
+ ALL_KNOWN_CAPS = (1 << 7) - 1
+};
+Q_DECLARE_FLAGS(Caps, Cap)
+
#endif /* DBUSOBJECTS_H */
diff -Naur ../kaffeine/src/dvb/dvbtab.cpp ./src/dvb/dvbtab.cpp
--- ../kaffeine/src/dvb/dvbtab.cpp 2009-11-23 11:06:03.000000000 +0100
+++ ./src/dvb/dvbtab.cpp 2009-11-23 11:18:25.000000000 +0100
@@ -117,6 +117,10 @@

connect(mediaWidget, SIGNAL(previousDvbChannel()), this, SLOT(previousChannel()));
connect(mediaWidget, SIGNAL(nextDvbChannel()), this, SLOT(nextChannel()));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(const QString&)), this, SLOT(setChannel(const QString&)));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(int)), this, SLOT(setChannel(int)));
+ connect(mediaWidget, SIGNAL(dvbLastChannel()), this, SLOT(setLastChannel()));
+ connect(mediaWidget, SIGNAL(toggleInstantRecord()), this, SLOT(toggleInstantRecord()));

connect(manager->getRecordingManager(), SIGNAL(instantRecordingRemoved()),
this, SLOT(instantRecordingRemoved()));
@@ -144,7 +148,7 @@
channelView->setRootIsDecorated(false);

if (!channelView->header()->restoreState(QByteArray::fromBase64(
- KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
+ KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
channelView->sortByColumn(0, Qt::AscendingOrder);
}

@@ -210,6 +214,11 @@
playChannel(manager->getChannelModel()->channelForName(name));
}

+void DvbTab::playChannel(int number)
+{
+ playChannel(manager->getChannelModel()->channelForNumber(number));
+}
+
void DvbTab::playLastChannel()
{
playChannel(KGlobal::config()->group("DVB").readEntry("LastChannel"));
@@ -244,6 +253,19 @@
dialog.exec();
}

+void DvbTab::toggleInstantRecord()
+{
+ if (instantRecordAction->isChecked()) {
+ instantRecordAction->setChecked(false);
+ instantRecord(false);
+ }
+ else {
+ instantRecordAction->setChecked(true);
+ instantRecord(true);
+ }
+}
+
+
void DvbTab::instantRecord(bool checked)
{
if (checked) {
@@ -351,4 +373,73 @@
if (channel != NULL) {
manager->getLiveView()->playChannel(channel);
}
+
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 0), Qt::DisplayRole, channel->name, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+
}
+
+void DvbTab::setChannel(const QString &name)
+{
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 0), Qt::DisplayRole, name, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+
+ playChannel(name);
+}
+
+void DvbTab::setChannel(int number)
+{
+
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 1), Qt::DisplayRole, number, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+ playChannel(number);
+
+}
+
+void DvbTab::setLastChannel()
+{
+ playLastChannel();
+}
+
diff -Naur ../kaffeine/src/dvb/dvbtab.h ./src/dvb/dvbtab.h
--- ../kaffeine/src/dvb/dvbtab.h 2009-11-23 11:06:02.000000000 +0100
+++ ./src/dvb/dvbtab.h 2009-11-23 11:18:24.000000000 +0100
@@ -38,11 +38,13 @@
class DvbTab : public TabBase
{
Q_OBJECT
+
public:
DvbTab(KMenu *menu, KActionCollection *collection, MediaWidget *mediaWidget_);
~DvbTab();

void playChannel(const QString &name);
+ void playChannel(int number);
void playLastChannel();

void enableDvbDump();
@@ -52,12 +54,16 @@
void showEpgDialog();
void showRecordingDialog();
void instantRecord(bool checked);
+ void toggleInstantRecord();
void instantRecordingRemoved();
void configureDvb();
void playLive(const QModelIndex &index);
void previousChannel();
void nextChannel();
void cleanTimeShiftFiles();
+ void setChannel(const QString &name);
+ void setChannel(int number);
+ void setLastChannel();

private:
void activate();
diff -Naur ../kaffeine/src/kaffeine.cpp ./src/kaffeine.cpp
--- ../kaffeine/src/kaffeine.cpp 2009-11-23 11:06:04.000000000 +0100
+++ ./src/kaffeine.cpp 2009-11-23 11:18:25.000000000 +0100
@@ -327,6 +327,15 @@
// initialize dbus objects
QDBusConnection::sessionBus().registerObject("/", new MprisRootObject(this),
QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Player", new MprisPlayerObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/TrackList", new MprisTrackListObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/DVB", new MprisDvbObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Display", new MprisDisplayObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+
QDBusConnection::sessionBus().registerService("org.mpris.kaffeine");

show();
diff -Naur ../kaffeine/src/mediawidget.cpp ./src/mediawidget.cpp
--- ../kaffeine/src/mediawidget.cpp 2009-11-23 11:06:02.000000000 +0100
+++ ./src/mediawidget.cpp 2009-11-23 11:18:24.000000000 +0100
@@ -374,6 +374,8 @@
connect(timer, SIGNAL(timeout()), this, SLOT(checkScreenSaver()));

stateChanged(Phonon::StoppedState);
+
+ setRepeat(false);
}

MediaWidget::~MediaWidget()
@@ -543,6 +545,67 @@
}
}

+bool MediaWidget::isPaused()
+{
+ if (playing && mediaObject->state() == Phonon::PausedState)
+ {
+ return true;
+ }
+ return false;
+}
+
+// also returns true when paused
+bool MediaWidget::isPlaying()
+{
+ return playing;
+}
+
+void MediaWidget::setRepeat(bool repeat_)
+{
+ repeat = repeat_;
+}
+
+bool MediaWidget::isRepeat()
+{
+ return repeat;
+}
+
+bool MediaWidget::hasMedia()
+{
+ if ( mediaObject->currentSource().type() != Phonon::MediaSource::Invalid ) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+void MediaWidget::setDvbChannel(int number)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(number);
+ }
+}
+
+void MediaWidget::setDvbChannel(const QString &name)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(name);
+ }
+}
+
+void MediaWidget::setDvbLastChannel()
+{
+ if (dvbFeed != NULL) {
+ emit dvbLastChannel();
+ }
+}
+
+void MediaWidget::fullScreen()
+{
+ emit toggleFullScreen();
+}
+
void MediaWidget::stateChanged(Phonon::State state)
{
bool newPlaying = false;
@@ -551,6 +614,7 @@
case Phonon::BufferingState:
case Phonon::PlayingState:
case Phonon::PausedState:
+ paused = true;
newPlaying = true;
break;

@@ -655,6 +719,31 @@
}
}

+void MediaWidget::playPause() {
+ //if (actionPlayPause->text() == textPlay) {
+ if (isPaused()) {
+ playPause(false);
+ }
+ else {
+ playPause(true);
+ }
+}
+
+void MediaWidget::play() {
+ if (playing && actionPlayPause->text() == textPlay) {
+ playPause(false);
+ }
+ else if (!playing) {
+ emit playlistPlay();
+ }
+}
+
+void MediaWidget::pause() {
+ if (playing && actionPlayPause->text() == textPause) {
+ playPause(true);
+ }
+}
+
void MediaWidget::stop()
{
mediaObject->stop();
@@ -726,6 +815,17 @@
}
}

+int MediaWidget::getVolume()
+{
+ int volume = audioOutput->volume() * 100;
+
+ if ( volume >= 0 && volume <= 100 ) {
+ return volume;
+ }
+
+ return 0;
+}
+
void MediaWidget::changeVolume(int volume)
{
audioOutput->setVolume(volume * qreal(0.01));
@@ -915,6 +1015,16 @@
mediaObject->seek(mediaObject->currentTime() + 1000 * longSkipDuration);
}

+void MediaWidget::setPosition(int position)
+{
+ mediaObject->seek(position);
+}
+
+int MediaWidget::getPosition()
+{
+ return mediaObject->currentTime();
+}
+
void MediaWidget::jumpToPosition()
{
JumpToPositionDialog dialog(QTime().addMSecs(mediaObject->currentTime()), this);
@@ -1150,3 +1260,62 @@
subtitleBox->setEnabled(false);
}
}
+
+QVariantMap MediaWidget::getMetadata()
+{
+ QVariantMap ret;
+ QMultiMap<QString, QString> multiMap = mediaObject->metaData();
+ QMultiMap<QString, QString>::const_iterator i = multiMap.constBegin();
+
+ while( i != multiMap.constEnd() )
+ {
+ ret[ i.key() ] = QVariant( i.value() );
+ i++;
+ }
+ return ret;
+}
+
+int getNumberOfTracks()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getCurrentTrack()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getLength()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::addTrack(QString track, bool play)
+{
+ //TODO
+ return 0;
+}
+
+void MediaWidget::delTrack(int position)
+{
+ //TODO
+}
+
+void MediaWidget::setLoop(bool loop)
+{
+ setRepeat(loop);
+}
+
+void MediaWidget::setRandom(bool random)
+{
+ //TODO
+}
+
+void MediaWidget::setNumber(int number)
+{
+ emit osdKeyPressed(number + Qt::Key_0);
+}
+
diff -Naur ../kaffeine/src/mediawidget.h ./src/mediawidget.h
--- ../kaffeine/src/mediawidget.h 2009-11-23 11:06:03.000000000 +0100
+++ ./src/mediawidget.h 2009-11-23 11:18:25.000000000 +0100
@@ -48,9 +48,14 @@
class MediaWidget : public QWidget
{
Q_OBJECT
+ friend class MprisPlayerObject;
+ friend class MprisTrackListObject;
+ friend class MprisDvbObject;
+ friend class MprisDisplayObject;
+
public:
MediaWidget(KMenu *menu_, KAction *fullScreenAction, KToolBar *toolBar,
- KActionCollection *collection, QWidget *parent);
+ KActionCollection *collection, QWidget *parent);
~MediaWidget();

static QString extensionFilter(); // usable for KFileDialog::setFilter()
@@ -78,6 +83,12 @@
void setShortSkipDuration(int duration);
void setLongSkipDuration(int duration);

+ void setRepeat(bool repeat_);
+ bool isRepeat();
+ bool hasMedia();
+
+ void setNumber(int number);
+
public slots:
void stop();
void stopDvb();
@@ -98,14 +109,35 @@
void startDvbTimeShift();
void changeDvbAudioChannel(int index);
void changeDvbSubtitle(int index);
+ void changeDvbChannel(int number);
+ void changeDvbChannel(const QString &name);
void dvbStopped();
void osdKeyPressed(int key);
+ void toggleOsd();
+
+ void dvbLastChannel();
+ void toggleInstantRecord();
+

private slots:
+ bool isPlaying();
+ bool isPaused();
+
+ int getPosition();
+ int getCurrentTrack();
+ int getLength();
+ int addTrack(QString track, bool play);
+ int getVolume();
+
+ QVariantMap getMetadata();
+
void stateChanged(Phonon::State state);
void playbackFinished();
void previous();
void playPause(bool paused);
+ void playPause();
+ void play();
+ void pause();
void next();
void changeAudioChannel(int index);
void changeSubtitle(int index);
@@ -132,6 +164,7 @@
void skipForward();
void longSkipForward();
void jumpToPosition();
+ void setPosition(int position);
void timeButtonClicked();
void updateTimeButton();
void updateCaption();
@@ -144,6 +177,17 @@

void checkScreenSaver();

+ void setDvbChannel(int number);
+ void setDvbChannel(const QString &name);
+ void setDvbLastChannel();
+
+ void fullScreen();
+
+ void delTrack(int position);
+ void setLoop(bool loop);
+ void setRandom(bool random);
+
+
private:
void contextMenuEvent(QContextMenuEvent *event);
void mouseDoubleClickEvent(QMouseEvent *);
@@ -164,6 +208,7 @@
Phonon::MediaController *mediaController;
DvbFeed *dvbFeed;
bool playing;
+ bool paused;

KAction *actionPrevious;
KAction *actionPlayPause;
@@ -204,6 +249,8 @@
KAction *jumpToPositionAction;
QPushButton *timeButton;
bool showElapsedTime;
+ bool repeat;
+ int inputNumber;
};

#endif /* MEDIAWIDGET_H */
diff -Naur ../kaffeine/src/playlist/playlistmodel.cpp ./src/playlist/playlistmodel.cpp
--- ../kaffeine/src/playlist/playlistmodel.cpp 2009-11-23 11:06:03.000000000 +0100
+++ ./src/playlist/playlistmodel.cpp 2009-11-23 11:18:25.000000000 +0100
@@ -48,6 +48,7 @@
QAbstractTableModel(parent), mediaWidget(mediaWidget_), repeat(false)
{
setSupportedDragActions(Qt::MoveAction);
+ mediaWidget->setRepeat(false);

connect(mediaWidget, SIGNAL(playlistPrevious()), this, SLOT(playPreviousTrack()));
connect(mediaWidget, SIGNAL(playlistPlay()), this, SLOT(playCurrentTrack()));
@@ -351,6 +352,7 @@
void PlaylistModel::repeatPlaylist(bool repeat_)
{
repeat = repeat_;
+ mediaWidget->setRepeat(repeat);
}

static bool playlistIndexLess(const PlaylistTrack &x, const PlaylistTrack &y)

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Kaffeine 1.0-pre2

2009-11-22T00:47:39Z

Kaffeine displays the following message when in uses. Cannot find input plugin for MRL [cadda:/].
Can anyone tell me what that message means.

Thank you;
Jim Bennett

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

uk-Redruth post digital-switchover network\location as of today

2009-11-21T16:31:01Z

#T 474167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
(duplicate 690000000)
T 497833000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
(duplicate 650166670) better SNR
#T 506167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
(duplicate 634167000)
T 521833000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
T 634167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # West
Cornwall.. (duplicate 506167000) better SNR
#T 650166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE # (duplicate
497833000)
T 658167000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
T 690000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # South West
(duplicate 474167000) better SNR
T 714000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-21T14:31:26Z

Hi,

ok, here is the actual state of things. The mpris methods are all implemented, with a few stubs left: a few /TrackList methods still need to be implemented, but I will try to do it soon. The /Player Repeat() function is also a stub, because the playlist does not allow to repeat a single track yet. Also the GetCaps () function is incomplete.

I put much methods into the /Player object which are not part of the mpris specs, because it wouldn't make much sense to make a separate object for them. I think it should be ok, but if you don't agree, please tell me, it' not difficult to change...

I made a DVB/ object for dvb-related stuff and a Display/ object for methods like toggleFullScreen, I'm not sure if "Display" is the best name for that...

There is still a need for a method that allows to enter channel numbers with more than one digit with a remote control (or with the keyboard), I will try to do this in the next time, as for me it's the most important feature which is still missing.

I changed all dbus functions to begin with a capital letter, to be consistent with the mpris methods.

All this isn't thoroughly tested at all and rather crude, and there should certainly be more error checking, but I think this is true for almost all the rest of the app also, so it should be ok for the beginning ;)

changing the channel works, but I didn't manage to have the selection
changed to the new channel in the DvbChannelView tree. I don't know how to
get a valid QModelIndex that points to the correct DvbChannelModel. Please
look at the code and at my comments in DvbTab::setChannel(int number). I
tried almost everything and thereby learned a lot about the model / view
concept of Qt, but it didn't help me to find the solution... Maybe you
already know this probem Christoph, because there is the same issue when
kaffeine gets started with the "--tv <channel>" flag: it simply calls
DvbTab::playChannel(const QString &name), but it does not select the channel
in the DvbChannelView. The problem is that afterwards, calls to
MediaWidget::previous() and next() have no effect, because the currently
selected channel is not known. I hope that someone more clever than me will
solve this issue ;)


Yes, this one is trickier. Note that there exists a similar problem
e.g. with playPause(): you also need to update the ui state.

I now found a solution (although I don't know if it's the best), but I don't recognize what should be updated when the playPause() method is called, you have a better overview for sure...

ciao,
Pascal

Christoph Pfister schrieb:

Hi,

2009/11/6 Pascal Pollet pascal@...:

Hi,

here is what I've done so far, I think it should add enough d-bus to make
most users happy, including me :) Please look at it and tell me what you
think of it...


It's a very good starting point. There exists a mediaplayer dbus
specification MPRIS [1], which I consider worth to implement (so that
we don't add yet another dbus interface for common functionality).
I've committed preliminary support to svn (the "root" object). Could
you please adapt your patch to that concept (i.e. add a tracklist and
player object; in case of need just method stubs)? I'm aware of the
fact that the actions defined in that specification don't 100% map
Kaffeine's actions (e.g. Play() doing a rewind to the beginning of a
track), so you don't have to care about those details if you don't
want to do. I also know that not every mpris thing is possible
(especially the tracklist parts needs more work) and that there's not
a mpris thing for every action Kaffeine is able to perform (put them
in a separate object for now).

There is one problem left, when selecting a new DVB-channel directly by name
or by number, with the (new) functions:

dvbTab::setChannel(const QString &name)
and
DvbTab::setChannel(int number)

changing the channel works, but I didn't manage to have the selection
changed to the new channel in the DvbChannelView tree. I don't know how to
get a valid QModelIndex that points to the correct DvbChannelModel. Please
look at the code and at my comments in DvbTab::setChannel(int number). I
tried almost everything and thereby learned a lot about the model / view
concept of Qt, but it didn't help me to find the solution... Maybe you
already know this probem Christoph, because there is the same issue when
kaffeine gets started with the "--tv <channel>" flag: it simply calls
DvbTab::playChannel(const QString &name), but it does not select the channel
in the DvbChannelView. The problem is that afterwards, calls to
MediaWidget::previous() and next() have no effect, because the currently
selected channel is not known. I hope that someone more clever than me will
solve this issue ;)


Yes, this one is trickier. Note that there exists a similar problem
e.g. with playPause(): you also need to update the ui state.

cheers,
Pascal


Thanks,

Christoph


[1] http://wiki.xmms2.xmms.se/wiki/MPRIS

diff -Naur ../kaffeine/src/dbusobjects.cpp ./src/dbusobjects.cpp
--- ../kaffeine/src/dbusobjects.cpp 2009-11-21 23:11:28.000000000 +0100
+++ ./src/dbusobjects.cpp 2009-11-21 23:08:52.000000000 +0100
@@ -23,6 +23,9 @@
#include <QDBusMetaType>
#include <KAboutData>
#include <KApplication>
+#include <KUrl>
+
+#include "mediawidget.h"

QDBusArgument &operator<<(QDBusArgument &argument, const MprisVersionStruct &versionStruct)
{
@@ -40,9 +43,27 @@
return argument;
}

+QDBusArgument &operator<<(QDBusArgument &argument, const MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument << statusStruct.play << statusStruct.random << statusStruct.repeatTrack << statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &argument, MprisStatusStruct &statusStruct)
+{
+ argument.beginStructure();
+ argument >> statusStruct.play >> statusStruct.random >> statusStruct.repeatTrack >> statusStruct.repeatAll;
+ argument.endStructure();
+ return argument;
+}
+
+
MprisRootObject::MprisRootObject(QObject *parent) : QObject(parent)
{
qDBusRegisterMetaType<MprisVersionStruct>();
+ qDBusRegisterMetaType<MprisStatusStruct>();
}

MprisRootObject::~MprisRootObject()
@@ -67,3 +88,320 @@
versionStruct.minor = 0;
return versionStruct;
}
+
+MprisPlayerObject::MprisPlayerObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisPlayerObject::~MprisPlayerObject()
+{ }
+
+void MprisPlayerObject::Next()
+{
+ mediaWidget->next();
+}
+
+void MprisPlayerObject::Prev()
+{
+ mediaWidget->previous();
+}
+
+void MprisPlayerObject::PlayPause()
+{
+ mediaWidget->playPause();
+}
+
+void MprisPlayerObject::Play()
+{
+ mediaWidget->play();
+}
+
+void MprisPlayerObject::Pause()
+{
+ mediaWidget->pause();
+}
+
+int MprisPlayerObject::VolumeGet()
+{
+ return mediaWidget->getVolume();
+}
+
+void MprisPlayerObject::VolumeSet(int volume)
+{
+ mediaWidget->changeVolume(volume);
+}
+
+void MprisPlayerObject::VolumeIncrease()
+{
+ mediaWidget->increaseVolume();
+}
+
+void MprisPlayerObject::VolumeDecrease()
+{
+ mediaWidget->decreaseVolume();
+}
+
+int MprisPlayerObject::PositionGet()
+{
+ return mediaWidget->getPosition();
+}
+
+
+void MprisPlayerObject::PositionSet(int position)
+{
+ mediaWidget->setPosition(position);
+}
+
+void MprisPlayerObject::Repeat()
+{
+ //TODO
+ //repeating a single track not implemented yet, only whole playlist
+}
+
+int MprisPlayerObject::GetCaps()
+{
+ int caps = NO_CAPS;
+
+ if ( mediaWidget->hasMedia() )
+ {
+ if ( mediaWidget->isPlaying() && ! mediaWidget->isPaused() )
+ {
+ caps |= CAN_PAUSE;
+ }
+ else
+ {
+ caps |= CAN_PLAY;
+ }
+ }
+
+ caps |= CAN_HAS_TRACKLIST;
+
+ //TODO: CAN_GO_NEXT & CAN_GO_PREV & CAN_PROVIDE_METADATA
+
+ return caps;
+}
+
+void MprisPlayerObject::Stop()
+{
+ mediaWidget->stop();
+}
+
+MprisStatusStruct MprisPlayerObject::GetStatus()
+{
+ MprisStatusStruct statusStruct;
+ if ( mediaWidget->isPaused() )
+ {
+ statusStruct.play = 1;
+ }
+ else if ( mediaWidget->isPlaying() )
+ {
+ statusStruct.play = 0;
+ }
+ else
+ {
+ statusStruct.play = 2;
+ }
+
+ if ( mediaWidget->isRepeat() )
+ {
+ statusStruct.repeatAll = 1;
+ }
+ else
+ {
+ statusStruct.repeatAll = 0;
+ }
+
+ statusStruct.random = 0;
+ statusStruct.repeatTrack = 0;
+
+ return statusStruct;
+}
+
+QVariantMap MprisPlayerObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+void MprisPlayerObject::Play(const QString &url)
+{
+ KUrl kurl(url);
+ if (kurl.isValid()) {
+ mediaWidget->play(kurl);
+ }
+}
+
+void MprisPlayerObject::PlayAudioCd()
+{
+ mediaWidget->playAudioCd();
+}
+
+void MprisPlayerObject::PlayVideoCd()
+{
+ mediaWidget->playVideoCd();
+}
+
+void MprisPlayerObject::PlayDvd()
+{
+ mediaWidget->playDvd();
+}
+
+void MprisPlayerObject::ChangeAudioChannel(int index)
+{
+ mediaWidget->changeAudioChannel(index);
+}
+
+void MprisPlayerObject::ChangeSubtitle(int index)
+{
+ mediaWidget->changeSubtitle(index);
+}
+
+void MprisPlayerObject::ToggleMuted()
+{
+ mediaWidget->toggleMuted();
+}
+
+void MprisPlayerObject::LongSkipBackward()
+{
+ mediaWidget->longSkipBackward();
+}
+
+void MprisPlayerObject::SkipBackward()
+{
+ mediaWidget->skipBackward();
+}
+
+void MprisPlayerObject::SkipForward()
+{
+ mediaWidget->skipForward();
+}
+
+void MprisPlayerObject::LongSkipForward()
+{
+ mediaWidget->longSkipForward();
+}
+
+void MprisPlayerObject::TimeButtonClicked()
+{
+ mediaWidget->timeButtonClicked();
+}
+
+void MprisPlayerObject::UpdateTimeButton()
+{
+ mediaWidget->updateTimeButton();
+}
+
+
+MprisTrackListObject::MprisTrackListObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisTrackListObject::~MprisTrackListObject()
+{ }
+
+QVariantMap MprisTrackListObject::GetMetadata()
+{
+ return mediaWidget->getMetadata();
+}
+
+int MprisTrackListObject::GetCurrentTrack()
+{
+ return mediaWidget->getCurrentTrack();
+}
+
+int MprisTrackListObject::GetLength()
+{
+ return mediaWidget->getLength();
+}
+
+int MprisTrackListObject::AddTrack(QString track, bool play)
+{
+ return mediaWidget->addTrack(track, play);
+}
+
+void MprisTrackListObject::DelTrack(int position)
+{
+ mediaWidget->delTrack(position);
+}
+
+void MprisTrackListObject::SetLoop(bool loop)
+{
+ mediaWidget->setLoop(loop);
+}
+
+void MprisTrackListObject::SetRandom(bool random)
+{
+ mediaWidget->setRandom(random);
+}
+
+
+
+MprisDvbObject::MprisDvbObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDvbObject::~MprisDvbObject()
+{ }
+
+void MprisDvbObject::SetDvbChannel(const QString &name)
+{
+ mediaWidget->setDvbChannel(name);
+}
+
+void MprisDvbObject::SetDvbChannelNumber(int number)
+{
+ mediaWidget->setDvbChannel(number);
+}
+
+void MprisDvbObject::SetDvbLastChannel()
+{
+ mediaWidget->setDvbLastChannel();
+}
+
+void MprisDvbObject::StopDvb()
+{
+ mediaWidget->stopDvb();
+}
+
+void MprisDvbObject::ToggleInstantRecord()
+{
+ mediaWidget->toggleInstantRecord();
+}
+
+void MprisDvbObject::ToggleOsd()
+{
+ mediaWidget->toggleOsd();
+}
+
+
+
+MprisDisplayObject::MprisDisplayObject(MediaWidget *mediaWidget_): mediaWidget(mediaWidget_)
+{ }
+
+MprisDisplayObject::~MprisDisplayObject()
+{ }
+
+void MprisDisplayObject::ToggleFullScreen()
+{
+ mediaWidget->fullScreen();
+}
+
+void MprisDisplayObject::AspectRatioAuto()
+{
+ mediaWidget->aspectRatioAuto();
+}
+
+void MprisDisplayObject::AspectRatio4_3()
+{
+ mediaWidget->aspectRatio4_3();
+}
+
+void MprisDisplayObject::AspectRatio16_9()
+{
+ mediaWidget->aspectRatio16_9();
+}
+
+void MprisDisplayObject::AspectRatioWidget()
+{
+ mediaWidget->aspectRatioWidget();
+}
+
+
+
+
diff -Naur ../kaffeine/src/dbusobjects.h ./src/dbusobjects.h
--- ../kaffeine/src/dbusobjects.h 2009-11-21 23:11:28.000000000 +0100
+++ ./src/dbusobjects.h 2009-11-21 23:08:52.000000000 +0100
@@ -22,8 +22,12 @@
#define DBUSOBJECTS_H

#include <QMetaType>
+#include <QVariantMap>

struct MprisVersionStruct;
+struct MprisStatusStruct;
+
+class MediaWidget;

class MprisRootObject : public QObject
{
@@ -39,6 +43,129 @@
MprisVersionStruct MprisVersion();
};

+
+class MprisPlayerObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisPlayerObject(MediaWidget *mediaWidget_);
+ ~MprisPlayerObject();
+
+public slots:
+ void Next();
+ void Prev();
+ void Play();
+ void Pause();
+ void Stop();
+ int VolumeGet();
+ void VolumeSet(int volume);
+ int PositionGet();
+ void PositionSet(int position);
+ void Repeat();
+ MprisStatusStruct GetStatus();
+ QVariantMap GetMetadata();
+ int GetCaps();
+
+ // this functions are not part of the MPRIS specs
+ void PlayPause();
+ void VolumeIncrease();
+ void VolumeDecrease();
+ void Play(const QString &url);
+ void PlayAudioCd();
+ void PlayVideoCd();
+ void PlayDvd();
+ void ChangeAudioChannel(int index);
+ void ChangeSubtitle(int index);
+ void ToggleMuted();
+ void LongSkipBackward();
+ void SkipBackward();
+ void SkipForward();
+ void LongSkipForward();
+ void TimeButtonClicked();
+ void UpdateTimeButton();
+
+signals:
+ void CapsChange( int );
+ void StatusChange( MprisStatusStruct );
+ void TrackChange( QVariantMap );
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisTrackListObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisTrackListObject(MediaWidget *mediaWidget_);
+ ~MprisTrackListObject();
+
+public slots:
+ QVariantMap GetMetadata();
+ int GetCurrentTrack();
+ int GetLength();
+ int AddTrack(QString track, bool play);
+ void DelTrack(int position);
+ void SetLoop(bool loop);
+ void SetRandom(bool random);
+
+signals:
+ void TrackListChange(int);
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDvbObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDvbObject(MediaWidget *mediaWidget_);
+ ~MprisDvbObject();
+
+public slots:
+ void SetDvbChannel(const QString &name);
+ void SetDvbChannelNumber(int number);
+ void SetDvbLastChannel();
+ void StopDvb();
+ void ToggleInstantRecord();
+ void ToggleOsd();
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
+class MprisDisplayObject : public QObject
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.MediaPlayer")
+public:
+ explicit MprisDisplayObject(MediaWidget *mediaWidget_);
+ ~MprisDisplayObject();
+
+public slots:
+ void AspectRatioAuto();
+ void AspectRatio4_3();
+ void AspectRatio16_9();
+ void AspectRatioWidget();
+ void ToggleFullScreen();
+
+
+private:
+ MediaWidget *mediaWidget;
+
+};
+
+
struct MprisVersionStruct
{
quint16 major;
@@ -47,4 +174,30 @@

Q_DECLARE_METATYPE(MprisVersionStruct)

+struct MprisStatusStruct
+{
+ quint16 play;
+ quint16 random;
+ quint16 repeatTrack;
+ quint16 repeatAll;
+};
+
+Q_DECLARE_METATYPE(MprisStatusStruct)
+
+/**
+* The bit values for the capabilities flags
+*/
+enum Cap {
+ NO_CAPS = 0,
+ CAN_GO_NEXT = 1 << 0,
+ CAN_GO_PREV = 1 << 1,
+ CAN_PAUSE = 1 << 2,
+ CAN_PLAY = 1 << 3,
+ CAN_SEEK = 1 << 4,
+ CAN_PROVIDE_METADATA = 1 << 5,
+ CAN_HAS_TRACKLIST = 1 << 6,
+ ALL_KNOWN_CAPS = (1 << 7) - 1
+};
+Q_DECLARE_FLAGS(Caps, Cap)
+
#endif /* DBUSOBJECTS_H */
diff -Naur ../kaffeine/src/dvb/dvbliveview.cpp ./src/dvb/dvbliveview.cpp
--- ../kaffeine/src/dvb/dvbliveview.cpp 2009-11-21 23:11:27.000000000 +0100
+++ ./src/dvb/dvbliveview.cpp 2009-11-21 23:08:52.000000000 +0100
@@ -157,6 +157,7 @@
connect(mediaWidget, SIGNAL(dvbStopped()), this, SLOT(liveStopped()));

connect(mediaWidget, SIGNAL(osdKeyPressed(int)), this, SLOT(osdKeyPressed(int)));
+ connect(mediaWidget, SIGNAL(toggleOsd()), this, SLOT(toggleOsd()));
connect(&osdChannelTimer, SIGNAL(timeout()), this, SLOT(tuneOsdChannel()));
}

diff -Naur ../kaffeine/src/dvb/dvbtab.cpp ./src/dvb/dvbtab.cpp
--- ../kaffeine/src/dvb/dvbtab.cpp 2009-11-21 23:11:27.000000000 +0100
+++ ./src/dvb/dvbtab.cpp 2009-11-21 23:08:52.000000000 +0100
@@ -117,6 +117,10 @@

connect(mediaWidget, SIGNAL(previousDvbChannel()), this, SLOT(previousChannel()));
connect(mediaWidget, SIGNAL(nextDvbChannel()), this, SLOT(nextChannel()));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(const QString&)), this, SLOT(setChannel(const QString&)));
+ connect(mediaWidget, SIGNAL(changeDvbChannel(int)), this, SLOT(setChannel(int)));
+ connect(mediaWidget, SIGNAL(dvbLastChannel()), this, SLOT(setLastChannel()));
+ connect(mediaWidget, SIGNAL(toggleInstantRecord()), this, SLOT(toggleInstantRecord()));

connect(manager->getRecordingManager(), SIGNAL(instantRecordingRemoved()),
this, SLOT(instantRecordingRemoved()));
@@ -144,7 +148,7 @@
channelView->setRootIsDecorated(false);

if (!channelView->header()->restoreState(QByteArray::fromBase64(
- KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
+ KGlobal::config()->group("DVB").readEntry("ChannelViewState", QByteArray())))) {
channelView->sortByColumn(0, Qt::AscendingOrder);
}

@@ -210,6 +214,11 @@
playChannel(manager->getChannelModel()->channelForName(name));
}

+void DvbTab::playChannel(int number)
+{
+ playChannel(manager->getChannelModel()->channelForNumber(number));
+}
+
void DvbTab::playLastChannel()
{
playChannel(KGlobal::config()->group("DVB").readEntry("LastChannel"));
@@ -244,6 +253,19 @@
dialog.exec();
}

+void DvbTab::toggleInstantRecord()
+{
+ if (instantRecordAction->isChecked()) {
+ instantRecordAction->setChecked(false);
+ instantRecord(false);
+ }
+ else {
+ instantRecordAction->setChecked(true);
+ instantRecord(true);
+ }
+}
+
+
void DvbTab::instantRecord(bool checked)
{
if (checked) {
@@ -351,4 +373,73 @@
if (channel != NULL) {
manager->getLiveView()->playChannel(channel);
}
+
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 0), Qt::DisplayRole, channel->name, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+
}
+
+void DvbTab::setChannel(const QString &name)
+{
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 0), Qt::DisplayRole, name, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+
+ playChannel(name);
+}
+
+void DvbTab::setChannel(int number)
+{
+
+ QModelIndex index = channelView->indexAt(QPoint(0,0));
+
+ if (!index.isValid()) {
+ return;
+ }
+
+ DvbChannelModel *channelModel = (DvbChannelModel*) index.model();
+
+ QModelIndexList list = channelModel->match(channelModel->index(0, 1), Qt::DisplayRole, number, 1, Qt::MatchExactly);
+ QModelIndex index_new = list.value(0);
+
+ if (!index_new.isValid()) {
+ return;
+ }
+
+ channelView->setCurrentIndex(index_new);
+ playChannel(number);
+
+}
+
+void DvbTab::setLastChannel()
+{
+ playLastChannel();
+}
+
diff -Naur ../kaffeine/src/dvb/dvbtab.h ./src/dvb/dvbtab.h
--- ../kaffeine/src/dvb/dvbtab.h 2009-11-21 23:11:27.000000000 +0100
+++ ./src/dvb/dvbtab.h 2009-11-21 23:08:52.000000000 +0100
@@ -38,11 +38,13 @@
class DvbTab : public TabBase
{
Q_OBJECT
+
public:
DvbTab(KMenu *menu, KActionCollection *collection, MediaWidget *mediaWidget_);
~DvbTab();

void playChannel(const QString &name);
+ void playChannel(int number);
void playLastChannel();

void enableDvbDump();
@@ -52,12 +54,16 @@
void showEpgDialog();
void showRecordingDialog();
void instantRecord(bool checked);
+ void toggleInstantRecord();
void instantRecordingRemoved();
void configureDvb();
void playLive(const QModelIndex &index);
void previousChannel();
void nextChannel();
void cleanTimeShiftFiles();
+ void setChannel(const QString &name);
+ void setChannel(int number);
+ void setLastChannel();

private:
void activate();
diff -Naur ../kaffeine/src/kaffeine.cpp ./src/kaffeine.cpp
--- ../kaffeine/src/kaffeine.cpp 2009-11-21 23:11:28.000000000 +0100
+++ ./src/kaffeine.cpp 2009-11-21 23:08:52.000000000 +0100
@@ -327,6 +327,15 @@
// initialize dbus objects
QDBusConnection::sessionBus().registerObject("/", new MprisRootObject(this),
QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Player", new MprisPlayerObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/TrackList", new MprisTrackListObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/DVB", new MprisDvbObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+ QDBusConnection::sessionBus().registerObject("/Display", new MprisDisplayObject(mediaWidget),
+ QDBusConnection::ExportAllContents);
+
QDBusConnection::sessionBus().registerService("org.mpris.kaffeine");

show();
diff -Naur ../kaffeine/src/mediawidget.cpp ./src/mediawidget.cpp
--- ../kaffeine/src/mediawidget.cpp 2009-11-21 23:11:27.000000000 +0100
+++ ./src/mediawidget.cpp 2009-11-21 23:08:52.000000000 +0100
@@ -45,6 +45,8 @@
#include <KToolBar>
#include "osdwidget.h"

+#include <iostream>
+
class DvbFeed : public Phonon::AbstractMediaStream
{
public:
@@ -374,6 +376,8 @@
connect(timer, SIGNAL(timeout()), this, SLOT(checkScreenSaver()));

stateChanged(Phonon::StoppedState);
+
+ setRepeat(false);
}

MediaWidget::~MediaWidget()
@@ -543,6 +547,69 @@
}
}

+bool MediaWidget::isPaused()
+{
+ if (playing && mediaObject->state() == Phonon::PausedState)
+ {
+ return true;
+ }
+ return false;
+}
+
+// also returns true when paused
+bool MediaWidget::isPlaying()
+{
+ return playing;
+}
+
+void MediaWidget::setRepeat(bool repeat_)
+{
+ repeat = repeat_;
+}
+
+bool MediaWidget::isRepeat()
+{
+ return repeat;
+}
+
+bool MediaWidget::hasMedia()
+{
+ if ( mediaObject->currentSource().type() != Phonon::MediaSource::Invalid ) {
+ std::cout << "KAFFEINE: true" << std::endl;
+ return true;
+ }
+ else {
+ std::cout << "KAFFEINE: false" << std::endl;
+ return false;
+ }
+}
+
+void MediaWidget::setDvbChannel(int number)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(number);
+ }
+}
+
+void MediaWidget::setDvbChannel(const QString &name)
+{
+ if (dvbFeed != NULL) {
+ emit changeDvbChannel(name);
+ }
+}
+
+void MediaWidget::setDvbLastChannel()
+{
+ if (dvbFeed != NULL) {
+ emit dvbLastChannel();
+ }
+}
+
+void MediaWidget::fullScreen()
+{
+ emit toggleFullScreen();
+}
+
void MediaWidget::stateChanged(Phonon::State state)
{
bool newPlaying = false;
@@ -551,6 +618,7 @@
case Phonon::BufferingState:
case Phonon::PlayingState:
case Phonon::PausedState:
+ paused = true;
newPlaying = true;
break;

@@ -655,6 +723,31 @@
}
}

+void MediaWidget::playPause() {
+ //if (actionPlayPause->text() == textPlay) {
+ if (isPaused()) {
+ playPause(false);
+ }
+ else {
+ playPause(true);
+ }
+}
+
+void MediaWidget::play() {
+ if (playing && actionPlayPause->text() == textPlay) {
+ playPause(false);
+ }
+ else if (!playing) {
+ emit playlistPlay();
+ }
+}
+
+void MediaWidget::pause() {
+ if (playing && actionPlayPause->text() == textPause) {
+ playPause(true);
+ }
+}
+
void MediaWidget::stop()
{
mediaObject->stop();
@@ -726,6 +819,17 @@
}
}

+int MediaWidget::getVolume()
+{
+ int volume = audioOutput->volume() * 100;
+
+ if ( volume >= 0 && volume <= 100 ) {
+ return volume;
+ }
+
+ return 0;
+}
+
void MediaWidget::changeVolume(int volume)
{
audioOutput->setVolume(volume * qreal(0.01));
@@ -915,6 +1019,16 @@
mediaObject->seek(mediaObject->currentTime() + 1000 * longSkipDuration);
}

+void MediaWidget::setPosition(int position)
+{
+ mediaObject->seek(position);
+}
+
+int MediaWidget::getPosition()
+{
+ return mediaObject->currentTime();
+}
+
void MediaWidget::jumpToPosition()
{
JumpToPositionDialog dialog(QTime().addMSecs(mediaObject->currentTime()), this);
@@ -1150,3 +1264,57 @@
subtitleBox->setEnabled(false);
}
}
+
+QVariantMap MediaWidget::getMetadata()
+{
+ QVariantMap ret;
+ QMultiMap<QString, QString> multiMap = mediaObject->metaData();
+ QMultiMap<QString, QString>::const_iterator i = multiMap.constBegin();
+
+ while( i != multiMap.constEnd() )
+ {
+ ret[ i.key() ] = QVariant( i.value() );
+ i++;
+ }
+ return ret;
+}
+
+int getNumberOfTracks()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getCurrentTrack()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::getLength()
+{
+ //TODO
+ return 0;
+}
+
+int MediaWidget::addTrack(QString track, bool play)
+{
+ //TODO
+ return 0;
+}
+
+void MediaWidget::delTrack(int position)
+{
+ //TODO
+}
+
+void MediaWidget::setLoop(bool loop)
+{
+ setRepeat(loop);
+}
+
+void MediaWidget::setRandom(bool random)
+{
+ //TODO
+}
+
diff -Naur ../kaffeine/src/mediawidget.h ./src/mediawidget.h
--- ../kaffeine/src/mediawidget.h 2009-11-21 23:11:27.000000000 +0100
+++ ./src/mediawidget.h 2009-11-21 23:08:52.000000000 +0100
@@ -21,6 +21,7 @@
#ifndef MEDIAWIDGET_H
#define MEDIAWIDGET_H

+#include <QVariantMap>
#include <QWidget>
#include <Phonon/Global>
#include <Phonon/ObjectDescription>
@@ -48,9 +49,14 @@
class MediaWidget : public QWidget
{
Q_OBJECT
+ friend class MprisPlayerObject;
+ friend class MprisTrackListObject;
+ friend class MprisDvbObject;
+ friend class MprisDisplayObject;
+
public:
MediaWidget(KMenu *menu_, KAction *fullScreenAction, KToolBar *toolBar,
- KActionCollection *collection, QWidget *parent);
+ KActionCollection *collection, QWidget *parent);
~MediaWidget();

static QString extensionFilter(); // usable for KFileDialog::setFilter()
@@ -78,6 +84,10 @@
void setShortSkipDuration(int duration);
void setLongSkipDuration(int duration);

+ void setRepeat(bool repeat_);
+ bool isRepeat();
+ bool hasMedia();
+
public slots:
void stop();
void stopDvb();
@@ -98,14 +108,34 @@
void startDvbTimeShift();
void changeDvbAudioChannel(int index);
void changeDvbSubtitle(int index);
+ void changeDvbChannel(int number);
+ void changeDvbChannel(const QString &name);
void dvbStopped();
void osdKeyPressed(int key);
+ void toggleOsd();
+
+ void dvbLastChannel();
+ void toggleInstantRecord();

private slots:
+ bool isPlaying();
+ bool isPaused();
+
+ int getPosition();
+ int getCurrentTrack();
+ int getLength();
+ int addTrack(QString track, bool play);
+ int getVolume();
+
+ QVariantMap getMetadata();
+
void stateChanged(Phonon::State state);
void playbackFinished();
void previous();
void playPause(bool paused);
+ void playPause();
+ void play();
+ void pause();
void next();
void changeAudioChannel(int index);
void changeSubtitle(int index);
@@ -132,6 +162,7 @@
void skipForward();
void longSkipForward();
void jumpToPosition();
+ void setPosition(int position);
void timeButtonClicked();
void updateTimeButton();
void updateCaption();
@@ -144,6 +175,16 @@

void checkScreenSaver();

+ void setDvbChannel(int number);
+ void setDvbChannel(const QString &name);
+ void setDvbLastChannel();
+
+ void fullScreen();
+
+ void delTrack(int position);
+ void setLoop(bool loop);
+ void setRandom(bool random);
+
private:
void contextMenuEvent(QContextMenuEvent *event);
void mouseDoubleClickEvent(QMouseEvent *);
@@ -164,6 +205,7 @@
Phonon::MediaController *mediaController;
DvbFeed *dvbFeed;
bool playing;
+ bool paused;

KAction *actionPrevious;
KAction *actionPlayPause;
@@ -204,6 +246,7 @@
KAction *jumpToPositionAction;
QPushButton *timeButton;
bool showElapsedTime;
+ bool repeat;
};

#endif /* MEDIAWIDGET_H */
diff -Naur ../kaffeine/src/playlist/playlistmodel.cpp ./src/playlist/playlistmodel.cpp
--- ../kaffeine/src/playlist/playlistmodel.cpp 2009-11-21 23:11:27.000000000 +0100
+++ ./src/playlist/playlistmodel.cpp 2009-11-21 23:08:52.000000000 +0100
@@ -48,6 +48,7 @@
QAbstractTableModel(parent), mediaWidget(mediaWidget_), repeat(false)
{
setSupportedDragActions(Qt::MoveAction);
+ mediaWidget->setRepeat(false);

connect(mediaWidget, SIGNAL(playlistPrevious()), this, SLOT(playPreviousTrack()));
connect(mediaWidget, SIGNAL(playlistPlay()), this, SLOT(playCurrentTrack()));
@@ -351,6 +352,7 @@
void PlaylistModel::repeatPlaylist(bool repeat_)
{
repeat = repeat_;
+ mediaWidget->setRepeat(repeat);
}

static bool playlistIndexLess(const PlaylistTrack &x, const PlaylistTrack &y)

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

User

2009-11-21T13:04:19Z

--
Ismo Kuhmonen
Kontiopuisto 7 B 18
76120 Pieksämäki
p 046 6336111 & 044 9627227
ismokuh@...

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

[Fwd: dvb-c at-KarrerNet]

2009-11-21T05:42:46Z

hi!

pfa the updated list of channels.

br,
thomas

-------- Original-Nachricht --------
Betreff: dvb-c at-KarrerNet
Datum: Sat, 10 Jan 2009 12:04:45 +0100
Von: Thomas E. Horner <office@...>
An: kaffeine-user@...

hi folks!

i live in st. florian bei linz / austria, postal code A-4490.
i just created the attached kaffeine dvb-c scan list out of a w_scan list.
i verified it by scanning for channels and everything (including epg)
now works fine.
also, all channels in the karrernet cable network were found correctly
using the list.
i ask you to include the file in future releases so other users may scan
more conveniently.

br,
thomas

# Kabel St. Florian bei Linz/AT KarrerNet
# 2009-01-10
# freq sr fec mod
C 442000000 6900000 NONE QAM64
C 458000000 6900000 NONE QAM64
C 466000000 6900000 NONE QAM64
C 474000000 6900000 NONE QAM64
C 482000000 6900000 NONE QAM64
C 490000000 6900000 NONE QAM64
C 498000000 6900000 NONE QAM64
C 506000000 6900000 NONE QAM64
C 514000000 6900000 NONE QAM64
C 522000000 6900000 NONE QAM64
C 530000000 6900000 NONE QAM64
C 538000000 6900000 NONE QAM64
C 546000000 6900000 NONE QAM64
C 554000000 6900000 NONE QAM64
C 562000000 6900000 NONE QAM64
C 570000000 6900000 NONE QAM64
C 578000000 6900000 NONE QAM64
C 586000000 6900000 NONE QAM64
C 610000000 6900000 NONE QAM64
C 386000000 6900000 NONE QAM256
C 394000000 6900000 NONE QAM256
C 410000000 6900000 NONE QAM256
C 434000000 6900000 NONE QAM256

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

smime.p7s (7K) Download Attachment

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-20T07:47:10Z

Hi,

this e-mail is just to say that I didn't forget what I promised to do, I
simply hadn't much time in the two last weeks. But I think that I will
be able to send you a new patch in the next few days, if nothing gets in
the way... Have a nice week-end!

cheers,
Pascal

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Request: kaffeine --dvb start parameter

2009-11-17T06:00:48Z

Hi kaffeine people,

One feature i miss from the old versions is the possibilty
to start kaffeine from the cmdline in dvb mode with
the last tuned channel.

This would also keep some compatability to ~kaffeine-0.8.x.
I dunno if this is really a "wanted" feature, but it improves my
tv/dvb watching experience. I'm sure this could also be done
by altering the --tv parameter, but i'm no qt/c++ programmer
and my tries ended up in segfaults when starting kaffeine.

Whatever, it'd be cool to have this feature back ;)

A simple patch (applies to trunk), adds a --dvb parameter:
-------------------------------------
diff -ur kaffeine-9999/src/kaffeine.cpp kaffeine-9999-new/src/kaffeine.cpp
--- kaffeine-9999/src/kaffeine.cpp 2009-11-16 16:11:31.205787337 +0100
+++ kaffeine-9999-new/src/kaffeine.cpp 2009-11-16 21:30:35.943537036 +0100
@@ -345,6 +345,7 @@
options.add("audiocd", ki18n("Play Audio CD"));
options.add("videocd", ki18n("Play Video CD"));
options.add("dvd", ki18n("Play DVD"));
+ options.add("dvb", ki18n("Play TV (last tuned channel)")); // compatibility
option to kaffeine-0.8.x
options.add("tv <channel>", ki18n("Play TV channel"));
options.add("dumpdvb", ki18nc("command line option", "Dump dvb data (debug
option)"));
options.add("+[file]", ki18n("Files or URLs to play"));
@@ -387,6 +388,16 @@
return;
}

+ if (args->isSet("dvb")) {
+ // Start kaffeine in dvb mode using last watched channel
+
+ activateTab(DvbTabId);
+ dvbTab->playLastChannel();
+
+ args->clear();
+ return;
+ }
+
QString dvb = args->getOption("tv");

if (!dvb.isEmpty()) {

-------------------------------------

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: Review Request: qgpgmecryptoconfig.cpp:744: warning: suggest explicit braces to avoid ambiguous 'else'

2009-11-12T11:02:23Z

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://reviewboard.kde.org/r/2147/#review3058
-----------------------------------------------------------

this patch doesn't belong to the group 'kaffeine'

- Christoph

On 2009-11-12 17:55:03, Guy Maurel wrote:

>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://reviewboard.kde.org/r/2147/
> -----------------------------------------------------------
>
> (Updated 2009-11-12 17:55:03)
>
>
> Review request for kaffeine.
>
>
> Summary
> -------
>
> The dashboard
> http://dashboard.akonadi-project.org/CDash/index.php?project=kdelibs
> reports:
> /.../kdepim/libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp:744: warning: suggest explicit braces to avoid ambiguous 'else'
>
> at
> QGpgMECryptoConfigEntry::resetToDefault(
>
> my proposal: complete with some more parentheses
> see: qgpgmecryptoconfig-gm-58.diff
>
>
> Diffs
> -----
>
> /trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp 1046400
>
> Diff: http://reviewboard.kde.org/r/2147/diff
>
>
> Testing
> -------
>
>
> Thanks,
>
> Guy
>
>

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: kaffeine for kde4: what the?

2009-11-10T13:26:44Z

2009/11/10 Andrius da Costa Ribas <andriusmao@...>

regarding xine configuration: this is configurable through 'systemsettings' or 'kcmshell4 kcm_phonon'
please note that phonon may use other backend instead of xine.

well, the phonon xine configuration is so very damn bad..... you cannot configure almost nothing.... if you look at xine configuration in old kaffeine 0.8 the configuration dialog has so many options.... i've actually installed old kaffeine to be able to configure xine settings.... and this is the same for gstreamer. i still think that phonon configuration dialog is still an infant!!!

--
dott. ing. beso

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: kaffeine for kde4: what the?

2009-11-10T12:41:30Z

regarding xine configuration: this is configurable through 'systemsettings' or 'kcmshell4 kcm_phonon'

please note that phonon may use other backend instead of xine.

2009/11/9 Dexter Filmore <Dexter.Filmore@...>

So after 7 years of kde3 I set up a kubuntu 9.10 box for testing which
replaced my computer I use for watching videos.

This was my first real attempt on kde4 after 3 tries in VMs with kde4.0, 4.1
and 4.2 and after I decided that 4.3 still royally sucked I moved to gnome.

Wanted to keep Kaffeine as my movie player, still.

Now:
-F5 to F9 don't switch aspect ratio
-"I" doesn't toggle interlacing
-I can't click somewhere into the position bar and the slider jumps there. I
have to grab and drag it
-dropping a file into the player view doesn't play it at once but queues it.
It's been like this for years, why did you change it? We all got used to it.
-mouse wheel on position bar doesn't do a thing.
-biggest problem so far: I can't find any options where to configure the xine
engine. I guess I'll have to do that from KDE kontrols now that we got this
phonon thing going, but how would I call that from gnome?

Dex

--
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GCS d--(+)@ s-:+ a C++++ UL++ P+>++ L+++>++++ E-- W++ N o? K-
w--(---) !O M+ V- PS+ PE Y++ PGP t++(---)@ 5 X+(++) R+(++) tv--(+)@
b++(+++) DI+++ D- G++ e* h>++ r* y?
------END GEEK CODE BLOCK------

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-10T00:32:53Z

Hi,

> There exists a mediaplayer dbus
> specification MPRIS [1], which I consider worth to implement (so that
> we don't add yet another dbus interface for common functionality).

I fully agree, it' good to have standards.

> I've committed preliminary support to svn (the "root" object).

nice, I'll take it as a starting point.

> Could you please adapt your patch to that concept (i.e. add a tracklist and
> player object; in case of need just method stubs)?
ok, no problem :) Yes for the beginning I will for sure leave some stubs
for the more difficult functions, which can be implemented later...

> I'm aware of the
> fact that the actions defined in that specification don't 100% map
> Kaffeine's actions (e.g. Play() doing a rewind to the beginning of a
> track), so you don't have to care about those details if you don't
> want to do. I also know that not every mpris thing is possible
> (especially the tracklist parts needs more work) and that there's not
> a mpris thing for every action Kaffeine is able to perform (put them
> in a separate object for now).
I'll see what I can do, I already began to port my stuff yesterday... I
would put methods like playPause() or increaseVolume() into the /Player
object even if they are not included in the mpris-specs, because
everything else would be very confusing... All the methods related to
the display (fullscreen, aspect-ratio) could come into an object named
/Display, and all the DVB-related stuff into an object /DVB. This can be
changed very easily later anyway......

In my last patch I forgot a function like the setNumber() function in
kaffeine 0.8 (with a timer for the input of numbers with more than one
digit), which is very important for the use with a remote control. I
will add this, and also a dbus-function to show/hide EPG information,
which I forgot too...

I must say it's really nice to work on kaffeine, because it's codebase
is very well structured and comprehensible, I got into it very fast.
I'll try to not mess it up too much ;)

cheers,
Pascal

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

kaffeine for kde4: what the?

2009-11-09T15:37:27Z

So after 7 years of kde3 I set up a kubuntu 9.10 box for testing which
replaced my computer I use for watching videos.

This was my first real attempt on kde4 after 3 tries in VMs with kde4.0, 4.1
and 4.2 and after I decided that 4.3 still royally sucked I moved to gnome.

Wanted to keep Kaffeine as my movie player, still.

Now:
-F5 to F9 don't switch aspect ratio
-"I" doesn't toggle interlacing
-I can't click somewhere into the position bar and the slider jumps there. I
have to grab and drag it
-dropping a file into the player view doesn't play it at once but queues it.
It's been like this for years, why did you change it? We all got used to it.
-mouse wheel on position bar doesn't do a thing.
-biggest problem so far: I can't find any options where to configure the xine
engine. I guess I'll have to do that from KDE kontrols now that we got this
phonon thing going, but how would I call that from gnome?

Dex

--
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GCS d--(+)@ s-:+ a C++++ UL++ P+>++ L+++>++++ E-- W++ N o? K-
w--(---) !O M+ V- PS+ PE Y++ PGP t++(---)@ 5 X+(++) R+(++) tv--(+)@
b++(+++) DI+++ D- G++ e* h>++ r* y?
------END GEEK CODE BLOCK------

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

signature.asc (196 bytes) Download Attachment

From forum: kaffeine-user

unsbscribe

2009-11-08T11:30:38Z

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-08T09:46:03Z

Hi,

2009/11/6 Pascal Pollet <pascal@...>:
> Hi,
>
> here is what I've done so far, I think it should add enough d-bus to make
> most users happy, including me :) Please look at it and tell me what you
> think of it...

It's a very good starting point. There exists a mediaplayer dbus
specification MPRIS [1], which I consider worth to implement (so that
we don't add yet another dbus interface for common functionality).
I've committed preliminary support to svn (the "root" object). Could
you please adapt your patch to that concept (i.e. add a tracklist and
player object; in case of need just method stubs)? I'm aware of the
fact that the actions defined in that specification don't 100% map
Kaffeine's actions (e.g. Play() doing a rewind to the beginning of a
track), so you don't have to care about those details if you don't
want to do. I also know that not every mpris thing is possible
(especially the tracklist parts needs more work) and that there's not
a mpris thing for every action Kaffeine is able to perform (put them
in a separate object for now).

> There is one problem left, when selecting a new DVB-channel directly by name
> or by number, with the (new) functions:
>
> dvbTab::setChannel(const QString &name)
> and
> DvbTab::setChannel(int number)
>
> changing the channel works, but I didn't manage to have the selection
> changed to the new channel in the DvbChannelView tree. I don't know how to
> get a valid QModelIndex that points to the correct DvbChannelModel. Please
> look at the code and at my comments in DvbTab::setChannel(int number). I
> tried almost everything and thereby learned a lot about the model / view
> concept of Qt, but it didn't help me to find the solution... Maybe you
> already know this probem Christoph, because there is the same issue when
> kaffeine gets started with the "--tv <channel>" flag: it simply calls
> DvbTab::playChannel(const QString &name), but it does not select the channel
> in the DvbChannelView. The problem is that afterwards, calls to
> MediaWidget::previous() and next() have no effect, because the currently
> selected channel is not known. I hope that someone more clever than me will
> solve this issue ;)

Yes, this one is trickier. Note that there exists a similar problem
e.g. with playPause(): you also need to update the ui state.

> cheers,
> Pascal

Thanks,

Christoph

[1] http://wiki.xmms2.xmms.se/wiki/MPRIS

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Important Notice about Reviewboard

2009-11-08T03:11:58Z

Dear Reviewboard-Users,

Unfortunately I had to disable the user registration because we had a lot of
nonsense accounts created by spammers. Until we have installed a captcha
system or similar measures, all new accounts have to be requested via
bugs.kde.org . There is a component "Reviewboard" that you can choose to
request accounts. I will react as quckly as possible!

Ah, and to easily identify and delete all those spammer accounts, I need your
help: Please (if you haven't already done so) add your First and Lastname to
your account. If you don't want to do that just write me an email with your
account name.

Cheers,

David

PS: if anyone has experience in python and webdevelopment and wants to help to
add a captcha to reviewboard, please drop me an email :)

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-07T09:40:11Z

2009/11/6 Pascal Pollet <pascal@...>:
<snip>
> I don't think you need to care about this Christoph, I already reported this
> bug to sourceforge : bug #6149

Thanks for the update.

> cheers,
> Pascal

Christoph

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

From forum: kaffeine-devel

Re: two kaffeine frequency tables

2009-11-07T09:33:54Z

2009/11/4 dragoncity <dragoncity@...>:

> Hi,
> here are two frequency tables for Kaffeine that I 'built' for the
> Australian Cites of :
>
> Bendigo ( Central Victoria )
>
> Devonport ( Tasmania )
>
> --
> Cheers,
> Brett

Added, thanks!

Christoph

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
kaffeine-user mailing list
kaffeine-user@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-user

From forum: kaffeine-user

Re: dbus support for kaffeine

2009-11-06T03:03:03Z

sorry, in my 2 last mails I forgot to respond to this:

I sent an email to this mailing list with a patch attached one hour ago,
but now I looked at the mailing list archive
(http://sourceforge.net/mailarchive/forum.php?forum_name=kaffeine-devel),
and it seems that only the patch reached the mailing list, and not the
body of the email.

Right, there seems to be a problem (I'll take care of it).

I don't think you need to care about this Christoph, I already reported this bug to sourceforge : bug #6149

cheers,
Pascal

Pascal Pollet schrieb:

Hi,

here is what I've done so far, I think it should add enough d-bus to
make most users happy, including me :) Please look at it and tell me
what you think of it...

There is one problem left, when selecting a new DVB-channel directly by
name or by number, with the (new) functions:

dvbTab::setChannel(const QString &name)
and
DvbTab::setChannel(int number)

changing the channel works, but I didn't manage to have the selection
changed to the new channel in the DvbChannelView tree. I don't know how
to get a valid QModelIndex that points to the correct DvbChannelModel.
Please look at the code and at my comments in DvbTab::setChannel(int
number). I tried almost everything and thereby learned a lot about the
model / view concept of Qt, but it didn't help me to find the
solution... Maybe you already know this probem Christoph, because there
is the same issue when kaffeine gets started with the "--tv <channel>"
flag: it simply calls DvbTab::playChannel(const QString &name), but it
does not select the channel in the DvbChannelView. The problem is that
afterwards, calls to MediaWidget::previous() and next() have no effect,
because the currently selected channel is not known. I hope that someone
more clever than me will solve this issue ;)

cheers,
Pascal







Pascal Pollet schrieb:

Thank you for your feedback Christoph, I'll consider the points you
mentioned and try to implement the complete dbus-functionality in the
very near future. Maybe I'll come up with some questions if things are
unclear, we'll see :)

cheers,
Pascal


Christoph Pfister schrieb:

2009/10/30 Pascal Pollet pascal@...:

Hi,

I sent an email to this mailing list with a patch attached one hour ago,
but now I looked at the mailing list archive
(http://sourceforge.net/mailarchive/forum.php?forum_name=kaffeine-devel),
and it seems that only the patch reached the mailing list, and not the
body of the email.

Right, there seems to be a problem (I'll take care of it).

Is this maybe a sourceforge bug? So I send the mail
again, without the patch this time:


Hello guys,

I am since the very beginning of kaffeine a great fan of this
application and use it for watching movies and TV. In the new version, I
miss a dbus interface to be able to use my remote control for watching
TV. As I know a little bit of C++ and Qt, I decided to implement the
dbus features for kaffeine, btw. giving me the occasion to learn how to
do this. Here is a small patch which makes two functions of dvbtab.cpp
available for dbus: previousChannel() and nextChannel(). It is just a
minimal proof of principle, to show you how I would implement the dbus
functionality. I would be really happy to contribute to this cool
project, so if you are interested in my code, please tell me. I would
add dbus support for all functions which should be accessible from the
outside world.

I appreciate contributions (I have to code less; you learn something
;-). See below for a (short, I'm sorry) feedback.

For my developer background, I like to contribute with mostly small
patches to various open-source projects, and I am the guy from this
project: http://www.bongosoft.de (german page!).
Newly, I also started this one:
http://www.kde-look.org/content/show.php/Babeleo+translator?content=110491
In "real life" I am about to finalize a Ph.D. in bioinformatics in the
nice town of Freiburg/Germany...

I am both French and German, so you can talk to me in any of these
languages, naturally also in English.

The patch is against revision 1042616 of the SVN tree.

greetings,
Pascal

diff -Naur ../kaffeine_ori/src/CMakeLists.txt ./src/CMakeLists.txt
--- ../kaffeine_ori/src/CMakeLists.txt  2009-10-30 10:34:30.000000000 +0100
+++ ./src/CMakeLists.txt        2009-10-30 11:08:47.000000000 +0100
@@ -2,6 +2,7 @@
    dvb/dvbchannel.cpp
    dvb/dvbchannelui.cpp
    dvb/dvbconfigdialog.cpp
+    dvb/dvbdbusadaptor.cpp

please place the file in the src/ directory and call it dbusadaptor.cpp

    dvb/dvbdevice.cpp
    dvb/dvbepg.cpp
    dvb/dvbmanager.cpp
diff -Naur ../kaffeine_ori/src/dvb/dvbdbusadaptor.h ./src/dvb/dvbdbusadaptor.h
--- ../kaffeine_ori/src/dvb/dvbdbusadaptor.h    1970-01-01 01:00:00.000000000 +0100
+++ ./src/dvb/dvbdbusadaptor.h  2009-10-30 11:08:47.000000000 +0100
@@ -0,0 +1,19 @@

use a header include guard =
#ifndef DBUSADAPTOR_H
#define DBUSADAPTOR_H

...

#endif

+#include <QDBusAbstractAdaptor>
+
+class DvbTab;
+
+class dvbdbusadaptor: public QDBusAbstractAdaptor
+{
+       Q_OBJECT
+       Q_CLASSINFO("D-Bus Interface", "org.kde.kaffeine")
+
+private:
+       DvbTab* dtab;
+
+public:
+       dvbdbusadaptor(QWidget* dvbTab);
+
+public slots:
+       void nextTvChannel();
+       void previousTvChannel();

please call those slots previous() and next()

+};
diff -Naur ../kaffeine_ori/src/dvb/dvbdbusadaptor.cpp ./src/dvb/dvbdbusadaptor.cpp
--- ../kaffeine_ori/src/dvb/dvbdbusadaptor.cpp  1970-01-01 01:00:00.000000000 +0100
+++ ./src/dvb/dvbdbusadaptor.cpp        2009-10-30 11:08:47.000000000 +0100
@@ -0,0 +1,19 @@
+#include "dvbdbusadaptor.h"
+#include "dvbtab.h"
+
+
+dvbdbusadaptor::dvbdbusadaptor(QWidget* dvbtab)
+: QDBusAbstractAdaptor(dvbtab)
+{
+       dtab = dynamic_cast<DvbTab*>(dvbtab);

avoid dynamic casts

+}
+
+Q_NOREPLY void dvbdbusadaptor::previousTvChannel()
+{
+       dtab->previousChannel();

call mediaWidget->previous()

+}
+
+Q_NOREPLY void dvbdbusadaptor::nextTvChannel()
+{
+       dtab->nextChannel();

call mediaWidget->next()

+}
diff -Naur ../kaffeine_ori/src/dvb/dvbtab.cpp ./src/dvb/dvbtab.cpp
--- ../kaffeine_ori/src/dvb/dvbtab.cpp  2009-10-30 10:34:30.000000000 +0100
+++ ./src/dvb/dvbtab.cpp        2009-10-30 11:08:47.000000000 +0100
@@ -21,6 +21,7 @@
 #include "dvbtab.h"

 #include <QBoxLayout>
+#include <QDBusConnection>
 #include <QDir>
 #include <QHeaderView>
 #include <QPainter>
@@ -37,6 +38,7 @@
 #include "../osdwidget.h"
 #include "dvbchannelui.h"
 #include "dvbconfigdialog.h"
+#include "dvbdbusadaptor.h"
 #include "dvbepg.h"
 #include "dvbmanager.h"
 #include "dvbrecording.h@.../DVB", this);
+       QDBusConnection::sessionBus().registerService("org.kde.kaffeine");

initialise the adapter from Kaffeine::Kaffeine()

 }

 DvbTab::~DvbTab()
diff -Naur ../kaffeine_ori/src/dvb/dvbtab.h ./src/dvb/dvbtab.h
--- ../kaffeine_ori/src/dvb/dvbtab.h    2009-10-30 10:34:30.000000000 +0100
+++ ./src/dvb/dvbtab.h  2009-10-30 11:08:47.000000000 +0100
@@ -42,6 +42,8 @@
 class DvbTab : public TabBase
 {
       Q_OBJECT
+       friend class dvbdbusadaptor;
+
 public:
       DvbTab(KMenu *menu, KActionCollection *collection, MediaWidget *mediaWidget_);
       ~DvbTab();

Thanks,

Christoph

From forum: kaffeine-devel