Nabble - kaffeine-devel

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

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

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

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

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

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

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

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

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

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

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

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

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

Re: dbus support for kaffeine

2009-11-06T01:54:02Z

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

diff -Naur ../kaffeine_ori/src/CMakeLists.txt ./src/CMakeLists.txt
--- ../kaffeine_ori/src/CMakeLists.txt 2009-11-05 09:13:12.000000000 +0100
+++ ./src/CMakeLists.txt 2009-11-05 23:26:07.000000000 +0100
@@ -14,6 +14,7 @@
playlist/playlistmodel.cpp
playlist/playlisttab.cpp
datetimeedit.cpp
+ dbusadaptor.cpp
kaffeine.cpp
main.cpp
mediawidget.cpp
diff -Naur ../kaffeine_ori/src/dbusadaptor.cpp ./src/dbusadaptor.cpp
--- ../kaffeine_ori/src/dbusadaptor.cpp 1970-01-01 01:00:00.000000000 +0100
+++ ./src/dbusadaptor.cpp 2009-11-05 23:26:08.000000000 +0100
@@ -0,0 +1,171 @@
+#include "dbusadaptor.h"
+#include "mediawidget.h"
+
+#include <KUrl>
+
+
+DbusAdaptor::DbusAdaptor(MediaWidget *mediaWidget_)
+: QDBusAbstractAdaptor(mediaWidget_), mediaWidget(mediaWidget_)
+{ }
+
+DbusAdaptor::~DbusAdaptor() { }
+
+void DbusAdaptor::previous()
+{
+ mediaWidget->previous();
+}
+
+void DbusAdaptor::playPause()
+{
+ mediaWidget->playPause();
+}
+
+void DbusAdaptor::next()
+{
+ mediaWidget->next();
+}
+
+void DbusAdaptor::toggleMuted()
+{
+ mediaWidget->toggleMuted();
+}
+
+void DbusAdaptor::increaseVolume()
+{
+ mediaWidget->increaseVolume();
+}
+
+void DbusAdaptor::decreaseVolume()
+{
+ mediaWidget->decreaseVolume();
+}
+
+void DbusAdaptor::changeAudioChannel(int index)
+{
+ mediaWidget->changeAudioChannel(index);
+}
+
+void DbusAdaptor::changeSubtitle(int index)
+{
+ mediaWidget->changeSubtitle(index);
+}
+
+void DbusAdaptor::changeVolume(int volume)
+{
+ if ( volume >= 0 && volume <= 100 ) {
+ mediaWidget->changeVolume(volume);
+ }
+}
+
+void DbusAdaptor::setDvbChannel(const QString &name)
+{
+ mediaWidget->setDvbChannel(name);
+}
+
+void DbusAdaptor::setDvbChannelNumber(int number)
+{
+ mediaWidget->setDvbChannel(number);
+}
+
+void DbusAdaptor::setDvbLastChannel()
+{
+ mediaWidget->setDvbLastChannel();
+}
+
+void DbusAdaptor::aspectRatioAuto()
+{
+ mediaWidget->aspectRatioAuto();
+}
+
+void DbusAdaptor::aspectRatio4_3()
+{
+ mediaWidget->aspectRatio4_3();
+}
+
+void DbusAdaptor::aspectRatio16_9()
+{
+ mediaWidget->aspectRatio16_9();
+}
+
+void DbusAdaptor::aspectRatioWidget()
+{
+ mediaWidget->aspectRatioWidget();
+}
+
+void DbusAdaptor::longSkipBackward()
+{
+ mediaWidget->longSkipBackward();
+}
+
+void DbusAdaptor::skipBackward()
+{
+ mediaWidget->skipBackward();
+}
+
+void DbusAdaptor::skipForward()
+{
+ mediaWidget->skipForward();
+}
+
+void DbusAdaptor::longSkipForward()
+{
+ mediaWidget->longSkipForward();
+}
+
+void DbusAdaptor::jumpToPosition()
+{
+ mediaWidget->jumpToPosition();
+}
+
+void DbusAdaptor::timeButtonClicked()
+{
+ mediaWidget->timeButtonClicked();
+}
+
+void DbusAdaptor::updateTimeButton()
+{
+ mediaWidget->updateTimeButton();
+}
+
+void DbusAdaptor::play(const QString &url)
+{
+ KUrl kurl(url);
+ if (kurl.isValid()) {
+ mediaWidget->play(kurl);
+ }
+}
+
+void DbusAdaptor::playAudioCd()
+{
+ mediaWidget->playAudioCd();
+}
+
+void DbusAdaptor::playVideoCd()
+{
+ mediaWidget->playVideoCd();
+}
+
+void DbusAdaptor::playDvd()
+{
+ mediaWidget->playDvd();
+}
+
+void DbusAdaptor::stop()
+{
+ mediaWidget->stop();
+}
+
+void DbusAdaptor::stopDvb()
+{
+ mediaWidget->stopDvb();
+}
+
+void DbusAdaptor::toggleFullScreen()
+{
+ mediaWidget->fullScreen();
+}
+
+void DbusAdaptor::toggleInstantRecord()
+{
+ mediaWidget->toggleInstantRecord();
+}
diff -Naur ../kaffeine_ori/src/dbusadaptor.h ./src/dbusadaptor.h
--- ../kaffeine_ori/src/dbusadaptor.h 1970-01-01 01:00:00.000000000 +0100
+++ ./src/dbusadaptor.h 2009-11-05 23:26:07.000000000 +0100
@@ -0,0 +1,56 @@
+#ifndef DBUSADAPTOR_H
+#define DBUSADAPTOR_H
+
+#include <QDBusAbstractAdaptor>
+#include <QString>
+
+class MediaWidget;
+//class KUrl;
+
+class DbusAdaptor: public QDBusAbstractAdaptor
+{
+ Q_OBJECT
+ Q_CLASSINFO("D-Bus Interface", "org.kde.kaffeine")
+
+private:
+ MediaWidget *mediaWidget;
+
+public:
+ DbusAdaptor(MediaWidget *mediaWidget_);
+ ~DbusAdaptor();
+
+public slots:
+ void next();
+ void previous();
+ void playPause();
+ void changeAudioChannel(int index);
+ void changeSubtitle(int index);
+ void setDvbChannel(const QString &name);
+ void setDvbChannelNumber(int number);
+ void setDvbLastChannel();
+ void toggleMuted();
+ void changeVolume(int volume);
+ void increaseVolume();
+ void decreaseVolume();
+ void aspectRatioAuto();
+ void aspectRatio4_3();
+ void aspectRatio16_9();
+ void aspectRatioWidget();
+ void longSkipBackward();
+ void skipBackward();
+ void skipForward();
+ void longSkipForward();
+ void jumpToPosition();
+ void timeButtonClicked();
+ void updateTimeButton();
+ void play(const QString &url);
+ void playAudioCd();
+ void playVideoCd();
+ void playDvd();
+ void stop();
+ void stopDvb();
+ void toggleFullScreen();
+ void toggleInstantRecord();
+};
+
+#endif /* DBUSADAPTOR_H */
diff -Naur ../kaffeine_ori/src/dvb/dvbtab.cpp ./src/dvb/dvbtab.cpp
--- ../kaffeine_ori/src/dvb/dvbtab.cpp 2009-11-05 09:13:12.000000000 +0100
+++ ./src/dvb/dvbtab.cpp 2009-11-05 23:26:07.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->getRecordingModel(), 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"));
@@ -245,6 +254,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) {
@@ -353,3 +375,35 @@
manager->getLiveView()->playChannel(channel);
}
}
+
+void DvbTab::setChannel(const QString &name)
+{
+ playChannel(name);
+}
+
+void DvbTab::setChannel(int number)
+{
+ // with this way to get QModelIndex, the later setCurrentIndex(index) call does not work:
+ //QModelIndex index = manager->getChannelModel()->index(number, 0);
+
+ // another way to obtain the QModelIndex, but doesn't work too:
+ DvbChannelModel *channelModel = (DvbChannelModel*) channelView->getModel();
+ QModelIndex index = channelModel->index(number, 0);
+
+ // for testing purposes, returns this runtime error (why?):
+ // QSortFilterProxyModel: index from wrong model passed to mapToSource
+ channelView->mapToSource(index);
+
+ // Has no effect (index from wrong model?):
+ channelView->setCurrentIndex(index);
+
+ // at least this works
+ playChannel(number);
+
+}
+
+void DvbTab::setLastChannel()
+{
+ playLastChannel();
+}
+
diff -Naur ../kaffeine_ori/src/dvb/dvbtab.h ./src/dvb/dvbtab.h
--- ../kaffeine_ori/src/dvb/dvbtab.h 2009-11-05 09:13:12.000000000 +0100
+++ ./src/dvb/dvbtab.h 2009-11-05 23:26:07.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_ori/src/kaffeine.cpp ./src/kaffeine.cpp
--- ../kaffeine_ori/src/kaffeine.cpp 2009-11-05 09:13:12.000000000 +0100
+++ ./src/kaffeine.cpp 2009-11-05 23:26:08.000000000 +0100
@@ -20,6 +20,7 @@

#include "kaffeine.h"

+#include <QDBusConnection>
#include <QHoverEvent>
#include <QLabel>
#include <QSpinBox>
@@ -38,6 +39,7 @@
#include <KToolBar>
#include "dvb/dvbtab.h"
#include "playlist/playlisttab.h"
+#include "dbusadaptor.h"
#include "mediawidget.h"

class StartTab : public TabBase
@@ -322,6 +324,11 @@
// initialize random number generator
qsrand(QTime().msecsTo(QTime::currentTime()));

+ // initialize the dbus-adaptor
+ new DbusAdaptor(mediaWidget);
+ QDBusConnection::sessionBus().registerObject("/Player", mediaWidget);
+ QDBusConnection::sessionBus().registerService("org.kde.kaffeine");
+
show();
}

diff -Naur ../kaffeine_ori/src/mediawidget.cpp ./src/mediawidget.cpp
--- ../kaffeine_ori/src/mediawidget.cpp 2009-11-05 09:13:12.000000000 +0100
+++ ./src/mediawidget.cpp 2009-11-05 23:26:08.000000000 +0100
@@ -543,6 +543,32 @@
}
}

+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 +681,15 @@
}
}

+void MediaWidget::playPause() {
+ if (actionPlayPause->text() == textPlay) {
+ playPause(false);
+ }
+ else {
+ playPause(true);
+ }
+}
+
void MediaWidget::stop()
{
mediaObject->stop();
@@ -679,7 +714,9 @@
if ((dvbFeed != NULL) && !dvbFeed->audioChannels.isEmpty()) {
emit changeDvbAudioChannel(index);
} else {
- mediaController->setCurrentAudioChannel(audioChannels.at(index));
+ if ( index >= 0 && index < audioChannels.size() ) {
+ mediaController->setCurrentAudioChannel(audioChannels.at(index));
+ }
}
}
}
@@ -690,7 +727,9 @@
if ((dvbFeed != NULL) && !dvbFeed->subtitles.isEmpty()) {
emit changeDvbSubtitle(index);
} else {
- mediaController->setCurrentSubtitle(subtitles.at(index));
+ if ( index >= 0 && index < subtitles.size() ) {
+ mediaController->setCurrentSubtitle(subtitles.at(index));
+ }
}
}
}
diff -Naur ../kaffeine_ori/src/mediawidget.h ./src/mediawidget.h
--- ../kaffeine_ori/src/mediawidget.h 2009-11-05 09:13:12.000000000 +0100
+++ ./src/mediawidget.h 2009-11-05 23:26:07.000000000 +0100
@@ -48,9 +48,11 @@
class MediaWidget : public QWidget
{
Q_OBJECT
+ friend class DbusAdaptor;
+
public:
MediaWidget(KMenu *menu_, KAction *fullScreenAction, KToolBar *toolBar,
- KActionCollection *collection, QWidget *parent);
+ KActionCollection *collection, QWidget *parent);
~MediaWidget();

static QString extensionFilter(); // usable for KFileDialog::setFilter()
@@ -98,14 +100,19 @@
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 dvbLastChannel();
+ void toggleInstantRecord();

private slots:
void stateChanged(Phonon::State state);
void playbackFinished();
void previous();
void playPause(bool paused);
+ void playPause();
void next();
void changeAudioChannel(int index);
void changeSubtitle(int index);
@@ -135,6 +142,11 @@
void timeButtonClicked();
void updateTimeButton();
void updateCaption();
+ void setDvbChannel(int number);
+ void setDvbChannel(const QString &name);
+ void setDvbLastChannel();
+ void fullScreen();
+

void titleCountChanged(int count);
void chapterCountChanged(int count);
diff -Naur ../kaffeine_ori/src/proxytreeview.cpp ./src/proxytreeview.cpp
--- ../kaffeine_ori/src/proxytreeview.cpp 2009-11-05 09:13:12.000000000 +0100
+++ ./src/proxytreeview.cpp 2009-11-05 23:26:07.000000000 +0100
@@ -85,6 +85,11 @@
proxyModel->setSourceModel(model);
}

+QAbstractItemModel* ProxyTreeView::getModel()
+{
+ return proxyModel->sourceModel();
+}
+
void ProxyTreeView::contextMenuEvent(QContextMenuEvent *event)
{
if (!currentIndex().isValid()) {
diff -Naur ../kaffeine_ori/src/proxytreeview.h ./src/proxytreeview.h
--- ../kaffeine_ori/src/proxytreeview.h 2009-11-05 09:13:12.000000000 +0100
+++ ./src/proxytreeview.h 2009-11-05 23:26:08.000000000 +0100
@@ -36,6 +36,7 @@
QList<int> selectedRows() const;

void setModel(QAbstractItemModel *model);
+ QAbstractItemModel* getModel();

protected:
void contextMenuEvent(QContextMenuEvent *event);

------------------------------------------------------------------------------
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

Re: dbus support for kaffeine

2009-11-02T01:39:32Z

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"
>> @@ -424,6 +426,10 @@
>>
>> dvbOsdTimer = new QTimer(this);
>> connect(dvbOsdTimer, SIGNAL(timeout()), this, SLOT(osdTimeout()));
>> +
>> + new dvbdbusadaptor(this);
>> + QDBusConnection::sessionBus().registerObject("/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
>
>

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: dbus support for kaffeine

2009-11-02T01:00:39Z

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"
> @@ -424,6 +426,10 @@
>
> dvbOsdTimer = new QTimer(this);
> connect(dvbOsdTimer, SIGNAL(timeout()), this, SLOT(osdTimeout()));
> +
> + new dvbdbusadaptor(this);
> + QDBusConnection::sessionBus().registerObject("/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

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: Kaffeine (almost) successful build on mswindows

2009-11-01T12:25:03Z

2009/11/1 Devin Heitmueller <devin.heitmueller@...>:
<snip>
> Andrius,
>
> Pretty neat.
>
> It might make sense for you to propose a patch that includes a stub
> class for the dvb stuff, so that it builds cleanly on platforms that
> don't have Linux DVB.

You don't need a stub class; removing the kaffeinedvb target from
CMakeLists.txt (or making it conditional) is enough.

> Devin
>
> --
> Devin J. Heitmueller
> http://www.devinheitmueller.com
> AIM: devinheitmueller

Christoph

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: Kaffeine (almost) successful build on mswindows

2009-11-01T12:20:55Z

On Sun, Nov 1, 2009 at 2:12 PM, Andrius da Costa Ribas
<andriusmao@...> wrote:

> Including kaffeine-devel list
>
> --
> Andrius
>
> 2009/11/1 Andrius da Costa Ribas <andriusmao@...>
>>
>> I've just tried building Kaffeine on MSWindows and I've got surprised!!!
>> no code changes to build successfuly all targets ( except linux-specific dvb
>> parts )
>>
>> screenshot of kaffeine playing windows vista sample video butterfly.wmv
>> (using mplayer backend):
>> http://imagebin.ca/view/xHr9jvlF.html
>>
>> screenshot of about screen:
>> http://imagebin.ca/view/6E6q1LIC.html
>>
>> It's a mingw build, I've not tried it with msvc. Somehow I've got no
>> directshow backend in phonon installation ( KDE 4.3.2 - mingw4 - binary
>> packages from installer )
>>
>> @Christoph, is it time to change last question of FAQ? ;)
>>
>> some issues:
>> - when trying to open a dvd: "No stream found to handle url dvd://1",
>> similar for audio cd etc.. (I believe it's kde-windows issue)
>> - a small delay before starting video ( longer delay on first use ) ( I
>> believe it's backend issue )
>> - I'm not sure about konqueror and firefox kaffeine plugin
>>
>> Many thanks for all people who helped :)

Andrius,

Pretty neat.

It might make sense for you to propose a patch that includes a stub
class for the dvb stuff, so that it builds cleanly on platforms that
don't have Linux DVB.

Devin

--
Devin J. Heitmueller
http://www.devinheitmueller.com
AIM: devinheitmueller

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: Kaffeine (almost) successful build on mswindows

2009-11-01T11:12:17Z

Including kaffeine-devel list

--
Andrius

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

I've just tried building Kaffeine on MSWindows and I've got surprised!!! no code changes to build successfuly all targets ( except linux-specific dvb parts )

screenshot of kaffeine playing windows vista sample video butterfly.wmv (using mplayer backend):
http://imagebin.ca/view/xHr9jvlF.html

screenshot of about screen:
http://imagebin.ca/view/6E6q1LIC.html

It's a mingw build, I've not tried it with msvc. Somehow I've got no directshow backend in phonon installation ( KDE 4.3.2 - mingw4 - binary packages from installer )

@Christoph, is it time to change last question of FAQ? ;)

some issues:
- when trying to open a dvd: "No stream found to handle url dvd://1", similar for audio cd etc.. (I believe it's kde-windows issue)
- a small delay before starting video ( longer delay on first use ) ( I believe it's backend issue )
- I'm not sure about konqueror and firefox kaffeine plugin

Many thanks for all people who helped :)

build log:
C:\Users\Andrius\Desktop\kdetest\kaffeine\build>mingw32-make -k
[ 0%] Built target kaffeine_automoc
[ 4%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbdevice.obj
[ 8%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbepg.obj
[ 13%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbliveview.obj
[ 17%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbmanager.obj
[ 21%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbrecording.obj
[ 26%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbscan.obj
[ 30%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbscandialog.obj
[ 34%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbsi.obj
[ 39%] Building CXX object src/CMakeFiles/kaffeine.dir/dvb/dvbtab.obj
[ 43%] Building CXX object src/CMakeFiles/kaffeine.dir/playlist/playlistmodel.ob
j
[ 47%] Building CXX object src/CMakeFiles/kaffeine.dir/playlist/playlisttab.obj
[ 52%] Building CXX object src/CMakeFiles/kaffeine.dir/datetimeedit.obj
[ 56%] Building CXX object src/CMakeFiles/kaffeine.dir/kaffeine.obj
[ 60%] Building CXX object src/CMakeFiles/kaffeine.dir/main.obj
[ 65%] Building CXX object src/CMakeFiles/kaffeine.dir/mediawidget.obj
[ 69%] Building CXX object src/CMakeFiles/kaffeine.dir/osdwidget.obj
[ 73%] Building CXX object src/CMakeFiles/kaffeine.dir/proxytreeview.obj
Linking CXX executable ..\bin\kaffeine.exe
[ 91%] Built target kaffeine
[ 91%] Built target kaffeinedvb_automoc
[ 95%] Building CXX object src/CMakeFiles/kaffeinedvb.dir/kaffeinedvb_automoc.ob
j
[100%] Building CXX object src/CMakeFiles/kaffeinedvb.dir/dvb/dvbdevice_linux.ob
j
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:27:18: err
or: poll.h: No such file or directory
In file included from C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevic
e_linux.cpp:23:
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:95: error: '__u8' does n
ot name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:96: error: '__u8' does n
ot name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:97: error: '__u8' does n
ot name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:103: error: '__u16' does
not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:105: error: '__u32' does
not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:106: error: '__u32' does
not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:116: error: '__u16' does
not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:120: error: '__u32' does
not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:124: error: '__u32' does
not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/dmx.h:142: error: '__u64' does
not name a type
In file included from C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevic
e_linux.cpp:26:
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:79: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:80: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:81: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:82: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:83: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:84: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:85: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:86: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:96: error: '__u8' d
oes not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:97: error: '__u8' d
oes not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:102: error: '__u8'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:103: error: '__u8'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:211: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:216: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:237: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:348: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:351: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:352: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:353: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:357: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:358: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:360: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:362: error: '__u8'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:363: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:364: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\include/frontend.h:375: error: '__u32'
does not name a type
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual void DvbDeviceThread::run()':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:107: error
: 'pollfd' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:107: error
: expected ';' before 'pfds'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:108: error
: 'pfds' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:111: error
: 'POLLIN' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:119: error
: 'poll' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::setTone(DvbBackendDevice::SecTone)':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:313: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::setVoltage(DvbBackendDevice::SecVoltage)
':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:326: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::sendMessage(const char*, int)':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:340: error
: 'struct dvb_diseqc_master_cmd' has no member named 'msg'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:341: error
: 'struct dvb_diseqc_master_cmd' has no member named 'msg_len'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:343: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::sendBurst(DvbBackendDevice::SecBurst)':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:356: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::tune(const DvbTransponder&)':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:511: error
: 'struct dvb_frontend_parameters' has no member named 'frequency'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:513: error
: 'struct dvb_qam_parameters' has no member named 'symbol_rate'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:522: error
: 'struct dvb_frontend_parameters' has no member named 'frequency'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:524: error
: 'struct dvb_qpsk_parameters' has no member named 'symbol_rate'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:535: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:536: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:537: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:538: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:539: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:540: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:541: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:542: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:543: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:544: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:545: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:546: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:547: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:548: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:549: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:550: error
: 'union dtv_property::<anonymous>' has no member named 'data'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:551: error
: 'struct dtv_property' has no member named 'cmd'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:556: error
: 'struct dtv_properties' has no member named 'num'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:559: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:572: error
: 'struct dvb_frontend_parameters' has no member named 'frequency'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:590: error
: 'struct dvb_frontend_parameters' has no member named 'frequency'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:601: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual int DvbLinuxDevice::getSignal()':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:617: error
: '__u16' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:617: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual int DvbLinuxDevice::getSnr()':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:636: error
: '__u16' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:636: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::isTuned()':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:656: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'virtual bool DvbLinuxDevice::addPidFilter(int)':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:683: error
: 'struct dmx_pes_filter_params' has no member named 'pid'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:687: error
: 'struct dmx_pes_filter_params' has no member named 'flags'
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:689: error
: 'ioctl' was not declared in this scope
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp: In member
function 'bool DvbLinuxDevice::identifyDevice()':
C:\Users\Andrius\Desktop\kdetest\kaffeine\src\dvb\dvbdevice_linux.cpp:747: error
: 'ioctl' was not declared in this scope
mingw32-make[2]: *** [src/CMakeFiles/kaffeinedvb.dir/dvb/dvbdevice_linux.obj] Er
ror 1
mingw32-make[2]: Target `src/CMakeFiles/kaffeinedvb.dir/build' not remade becaus
e of errors.
mingw32-make[1]: *** [src/CMakeFiles/kaffeinedvb.dir/all] Error 2
mingw32-make[1]: Target `all' not remade because of errors.
mingw32-make: *** [all] Error 2
mingw32-make: Target `default_target' not remade because of errors.

Thanks again,
Andrius.

dbus support for kaffeine

2009-10-30T04:36:49Z

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. 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.

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
dvb/dvbdevice.cpp
dvb/dvbepg.cpp
dvb/dvbmanager.cpp
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);
+}
+
+Q_NOREPLY void dvbdbusadaptor::previousTvChannel()
+{
+ dtab->previousChannel();
+}
+
+Q_NOREPLY void dvbdbusadaptor::nextTvChannel()
+{
+ dtab->nextChannel();
+}
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 @@
+#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();
+};
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"
@@ -424,6 +426,10 @@

dvbOsdTimer = new QTimer(this);
connect(dvbOsdTimer, SIGNAL(timeout()), this, SLOT(osdTimeout()));
+
+ new dvbdbusadaptor(this);
+ QDBusConnection::sessionBus().registerObject("/DVB", this);
+ QDBusConnection::sessionBus().registerService("org.kde.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();

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

[patch] dbus support for kaffeine

2009-10-30T03:49:26Z

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.

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
dvb/dvbdevice.cpp
dvb/dvbepg.cpp
dvb/dvbmanager.cpp
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);
+}
+
+Q_NOREPLY void dvbdbusadaptor::previousTvChannel()
+{
+ dtab->previousChannel();
+}
+
+Q_NOREPLY void dvbdbusadaptor::nextTvChannel()
+{
+ dtab->nextChannel();
+}
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 @@
+#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();
+};
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"
@@ -424,6 +426,10 @@

dvbOsdTimer = new QTimer(this);
connect(dvbOsdTimer, SIGNAL(timeout()), this, SLOT(osdTimeout()));
+
+ new dvbdbusadaptor(this);
+ QDBusConnection::sessionBus().registerObject("/DVB", this);
+ QDBusConnection::sessionBus().registerService("org.kde.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();

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: Review Request: Fix some potential crashes suggested by EBN

2009-10-25T10:18:41Z

2009/8/11 Travis <wordsizzle@...>:
> Forwarded this from a reviewboard post i made (maybe kaffeine should have a
> group?):

Sorry for not responding to your patches (but that's not your problem;
the suggested solution is ugly). Anyway, a kaffeine group has been
added to reviewboard.

Thanks,

Christoph

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: Kaffeine as Movie Database manager

2009-09-12T15:41:14Z

On Sat, Sep 12, 2009 at 7:35 PM, Christoph Pfister <christophpfister@...> wrote:

Hi guys,

There is a relatively simple possibility to integrate such stuff into
Kaffeine: you could create an additional tab (in itws own
subdirectory). Tabs in Kaffeine are quite autonomous, so you can
basically do what you want inside it, and you could use the kaffeine
playback engine (you don't have to care about subtitles, volume,
fullscreen, etc). Personally I'm not too interested in that feature
(and for example don't know how it should look like); so that tab
would largely be your responsibility ...

This will be a movie list, user can register a movie in which case the user can add description of a video, rating of that video if it's a movie maybe a trailer link from youtube and/or information from imdb (this can be automatically when the movie name is entered) and of course the path to the video, then information about how many times the user has watched that video, favorites.

Also we can have a KaffeineSpace which can be a web service that user share their likeness of videos or movies, rate them and recommend them to other people (this idea just popped out :)).

What do you think about that?

I would like to work on that, because I am already working on my own player that is used only by me personally, why create something that is used only by one person, unless we can work together and bring such features to the masses.

Christoph

2009/9/12 Milot Shala <milot.shala@...>:

> Hi Andreas,
>
> I was interested in working on Kaffeine, I also wrote my own personal video
> player and it contains personal video management which then creates a simple
> playlist in which the user can have access to their video content and play
> them.
>
> If you need any help from my side, feel free to write to me and we can
> arrange a meeting on IRC.
>
>
> On Fri, Sep 11, 2009 at 10:38 PM, Andreas Marschke <xxtjaxx@...>
> wrote:
>>
>> Hi everyone,
>>
>> I want to start to work on Kaffeine. I already started to comment the
>> source
>> code so that it has atleast some basic documentation.
>> This comes especially handy if you use an editor like Emacs/KDevelop when
>> you
>> look at the headers simultanously to development or just want a quick
>> information about what a function actually does.
>>
>> I would like to enhance Kaffeine to a video database application that can
>> manage a big list of movies on the harddrive. Some of the goodness I would
>> like to introduce would be ratings, coments, tags, movie information
>> wikipages
>> and so on and so forth.
>>
>> What do you think about it?
>>
>> Cheers ,
>>
>> Andreas Marschke.
>>
>> ---
>> My blog :
>> http://adreasdevblog.wordpress.com
>>
>> I work with the head developer on this one:
>> http://techbase.kde.org/Projects/Aki
>>
>> My code repository on github:
>> https://github.com/xxtjaxx/xxtjaxxRepository/tree
>>
>>
>> ------------------------------------------------------------------------------
>> 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
>
>
>
> --
> Milot Shala
> gtalk: milot.shala@...
> blog: http://www.codespartan.org/blog/

--
Milot Shala
gtalk: milot.shala@...
blog: http://www.codespartan.org/blog/

------------------------------------------------------------------------------
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

Re: Kaffeine as Movie Database manager

2009-09-12T10:35:27Z

Hi guys,

There is a relatively simple possibility to integrate such stuff into
Kaffeine: you could create an additional tab (in itws own
subdirectory). Tabs in Kaffeine are quite autonomous, so you can
basically do what you want inside it, and you could use the kaffeine
playback engine (you don't have to care about subtitles, volume,
fullscreen, etc). Personally I'm not too interested in that feature
(and for example don't know how it should look like); so that tab
would largely be your responsibility ...

What do you think about that?

Christoph

2009/9/12 Milot Shala <milot.shala@...>:

> Hi Andreas,
>
> I was interested in working on Kaffeine, I also wrote my own personal video
> player and it contains personal video management which then creates a simple
> playlist in which the user can have access to their video content and play
> them.
>
> If you need any help from my side, feel free to write to me and we can
> arrange a meeting on IRC.
>
>
> On Fri, Sep 11, 2009 at 10:38 PM, Andreas Marschke <xxtjaxx@...>
> wrote:
>>
>> Hi everyone,
>>
>> I want to start to work on Kaffeine. I already started to comment the
>> source
>> code so that it has atleast some basic documentation.
>> This comes especially handy if you use an editor like Emacs/KDevelop when
>> you
>> look at the headers simultanously to development or just want a quick
>> information about what a function actually does.
>>
>> I would like to enhance Kaffeine to a video database application that can
>> manage a big list of movies on the harddrive. Some of the goodness I would
>> like to introduce would be ratings, coments, tags, movie information
>> wikipages
>> and so on and so forth.
>>
>> What do you think about it?
>>
>> Cheers ,
>>
>> Andreas Marschke.
>>
>> ---
>> My blog :
>> http://adreasdevblog.wordpress.com
>>
>> I work with the head developer on this one:
>> http://techbase.kde.org/Projects/Aki
>>
>> My code repository on github:
>> https://github.com/xxtjaxx/xxtjaxxRepository/tree
>>
>>
>> ------------------------------------------------------------------------------
>> 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
>
>
>
> --
> Milot Shala
> gtalk: milot.shala@...
> blog: http://www.codespartan.org/blog/

Re: Kaffeine as Movie Database manager

2009-09-11T16:16:06Z

Hi Andreas,

I was interested in working on Kaffeine, I also wrote my own personal video player and it contains personal video management which then creates a simple playlist in which the user can have access to their video content and play them.

If you need any help from my side, feel free to write to me and we can arrange a meeting on IRC.

On Fri, Sep 11, 2009 at 10:38 PM, Andreas Marschke <xxtjaxx@...> wrote:

Hi everyone,

I want to start to work on Kaffeine. I already started to comment the source
code so that it has atleast some basic documentation.
This comes especially handy if you use an editor like Emacs/KDevelop when you
look at the headers simultanously to development or just want a quick
information about what a function actually does.

I would like to enhance Kaffeine to a video database application that can
manage a big list of movies on the harddrive. Some of the goodness I would
like to introduce would be ratings, coments, tags, movie information wikipages
and so on and so forth.

What do you think about it?

Cheers ,

Andreas Marschke.

---
My blog :
http://adreasdevblog.wordpress.com

I work with the head developer on this one:
http://techbase.kde.org/Projects/Aki

My code repository on github:
https://github.com/xxtjaxx/xxtjaxxRepository/tree

------------------------------------------------------------------------------
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

Kaffeine as Movie Database manager

2009-09-11T13:38:01Z

Hi everyone,

I want to start to work on Kaffeine. I already started to comment the source
code so that it has atleast some basic documentation.
This comes especially handy if you use an editor like Emacs/KDevelop when you
look at the headers simultanously to development or just want a quick
information about what a function actually does.

I would like to enhance Kaffeine to a video database application that can
manage a big list of movies on the harddrive. Some of the goodness I would
like to introduce would be ratings, coments, tags, movie information wikipages
and so on and so forth.

What do you think about it?

Cheers ,

Andreas Marschke.

---
My blog :
http://adreasdevblog.wordpress.com

I work with the head developer on this one:
http://techbase.kde.org/Projects/Aki

My code repository on github:
https://github.com/xxtjaxx/xxtjaxxRepository/tree

------------------------------------------------------------------------------
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

Review Request: Fix some potential crashes suggested by EBN

2009-08-10T21:18:00Z

Forwarded this from a reviewboard post i made (maybe kaffeine should have a
group?):

> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://reviewboard.kde.org/r/1263/
> -----------------------------------------------------------
>
> Review request for Travis McHenry.
>
>
> Summary
> -------
>
> This fixes the 5 krazy2 issues found on EBN in kaffeine.
>http://www.englishbreakfastnetwork.org/krazy/reports/extragear/multimedia/kaffeine/
> Four of them are to avoid crashing with the dialogs (discussed here:
> http://www.kdedevelopers.org/node/3919 ) and the last one is to add the
> Q_OBJECT macro to dvbdevice_linux.h
>
> I'm putting it up here instead of committing it because I don't want to
> step on anybody's toes. :)
>
> I put just myself as the reviewer because there isn't a kaffeine group and
> I didn't want to send it to the wrong people. :-/ I'll be forwarding
> whatever mail I get to kaffeine-devel.
>
>
> Diffs
> -----
>
> /trunk/extragear/multimedia/kaffeine/src/dvb/dvbchannelui.cpp 1009874
> /trunk/extragear/multimedia/kaffeine/src/dvb/dvbdevice_linux.h 1009874
> /trunk/extragear/multimedia/kaffeine/src/dvb/dvbrecording.cpp 1009874
> /trunk/extragear/multimedia/kaffeine/src/mediawidget.cpp 1009874
>
> Diff: http://reviewboard.kde.org/r/1263/diff
>
>
> Testing
> -------
>
> It builds and I tested what dialogs I could. I'm not sure how to get to all
> of them without having a dvb setup.
>
>
> Thanks,
>
> Travis

Re: navigation bar orientation (patch)

2009-06-21T13:48:08Z

Thanks a lot for commit it :)

------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: navigation bar orientation (patch)

2009-06-21T13:27:22Z

Hi Javier,

2009/6/21 Javier Goday <jgoday@...>:
> Hi, i attach a patch to automatic change the navigation bar tabs orientation
> (North or west), depending of the areas in the main window.

Applied (after some beautification), thanks!

> Regards.

Christoph

------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

navigation bar orientation (patch)

2009-06-21T05:56:27Z

Hi, i attach a patch to automatic change the navigation bar tabs orientation (North or west), depending of the areas in the main window.

Regards.

[kaffeine-tabs-orientation.patch]

Index: src/kaffeine.cpp =================================================================== --- src/kaffeine.cpp (revision 984709) +++ src/kaffeine.cpp (working copy) @@ -182,6 +182,8 @@ // navigation bar - keep in sync with TabIndex enum! navigationBar = new KToolBar("navigation_bar", this, Qt::LeftToolBarArea); + connect(navigationBar, SIGNAL(orientationChanged(Qt::Orientation)), + this, SLOT(navigationBarOrientationChanged(Qt::Orientation))); tabBar = new KTabBar(navigationBar); tabBar->addTab(KIcon("start-here-kde"), i18n("Start")); @@ -465,6 +467,16 @@ setCursor(Qt::BlankCursor); } +void Kaffeine::navigationBarOrientationChanged(Qt::Orientation orientation) +{ + if (orientation == Qt::Horizontal) { + tabBar->setShape(KTabBar::RoundedNorth); + } + else { + tabBar->setShape(KTabBar::RoundedWest); + } +} + bool Kaffeine::event(QEvent *event) { bool retVal = KMainWindow::event(event); // this has to be done before calling setVisible() @@ -520,4 +532,4 @@ } KMainWindow::leaveEvent(event); -} +} \ No newline at end of file Index: src/kaffeine.h =================================================================== --- src/kaffeine.h (revision 984709) +++ src/kaffeine.h (working copy) @@ -61,6 +61,8 @@ void activateTab(int tabIndex); void hideCursor(); + void navigationBarOrientationChanged(Qt::Orientation orientation); + private: enum TabIndex { StartTabId = 0,

------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

snapshot66.png (90K) Download Attachment

Kaffeine 1.0-pre1 released

2009-04-26T13:02:02Z

This is a pre-release of the KDE4 version mainly intended as a preview
(there are still main features missing). A release more suitable for
end users is planned 1 - 1.5 months later. See the full announcement
at http://kaffeine.kde.org/?q=node/22.

Christoph

------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Proposal for Kaffeine.

2009-01-11T21:34:06Z

Hello, Kaffeine's developers. Sorry for disturb and my bad English.
I think Kaffeine's "Channels" window can be more useful, if it will have
a checkbox that allow to speak current Signal/SNR value to the line-out.
It will help peoples in fine tuning Satellite dishes. Yesterday, I used
Kaffeine's channels window for this reason. I'm ask for help my friend,
and we used mobile phones for tuning Satellite dish. This method not so
flexible as speaking values to line-out.
It is only proposal. I think this may be really useful thing in
Kaffeine. Again, sorry for disturb. Thank you!

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

dvbOSDSkip does not work propertly when "the next channel" does not have a current_channel->num+1

2008-11-19T08:12:13Z

Hello everyone,

my name is Leo Iannacone and I just started using kaffeine to see
satellite TV on my PC.

I immediately found a problem:

while displaying the OSD informations of a channel, I wanted to go to
the next channel informations, if the channel had not a
`current_channel->num= (+/-) 1` number, so I couldn't watch OSD infos of
the channel that I was looking for.

To better explain:
I'm watching channel num. 301.
Read OSD infos, skip to the next channel (302), and skip to the next too
(304).
The last channel (304) has not the `current_ch->num+1` (I don't have in
channels list a channel->num=303), so OSD is locked on the
current_channel (302) infos, unable to jump to channel 304.

I modified the function dvbOSDSkip file kaffeine/src/input/dvbpanel.cpp
just adding a simple `while`. Now the OSD is displayed properly.

The changes are very simple, see the attachment. I've tried it in
extreme cases (as jumping from channel 900 to channel 10090) and seems
to work fine.

Regards,
Leo.

--
GPG Key ID: 1024D/D59257A9
Key fingerprint: DC75 469F 4831 4293 81A4 423C 6884 31F6 D592 57A9
More info: http://wiki.ubuntu.com/LeoIannacone

--- kaffeine/src/input/dvb/dvbpanel.cpp 2008-11-19 14:26:25.000000000 +0100
+++ kaffeine/src/input/dvb/dvbpanel.new.cpp 2008-11-19 14:26:22.000000000 +0100
@@ -812,26 +812,32 @@

int mychan = -1;

- if (browseDvbStream == -1)
- mychan = dvbConfig->lastChannel;
- else
- mychan = browseDvbStream + skip;
-
- if (mychan < minChannelNumber)
- mychan = maxChannelNumber;
- else if (mychan > maxChannelNumber)
- mychan = minChannelNumber;
+ while(!chan)
+ {
+ if (browseDvbStream == -1)
+ mychan = dvbConfig->lastChannel;
+ else
+ mychan = browseDvbStream + skip;

- for (int i = 0; i < (int)channels.count(); i ++) {
- if ((int) channels.at(i)->num == mychan) {
- chan = channels.at(i);
- break;
+ if (mychan < minChannelNumber)
+ mychan = maxChannelNumber;
+ else if (mychan > maxChannelNumber)
+ mychan = minChannelNumber;
+
+ for (int i = 0; i < (int)channels.count(); i ++) {
+ if ((int) channels.at(i)->num == mychan) {
+ chan = channels.at(i);
+ break;
+ }
}
+
+ if(skip < 0)
+ skip --;
+ if (skip > 0)
+ skip ++;
+
}

- if (!chan)
- return;
-
for (int j = 0; j < (int)dvb.count(); j ++) {
if (dvb.at(j)->canSource(chan)) {
d = dvb.at(j);

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

Re: How to write visualization plugin for kaffeine?

2008-10-12T05:25:36Z

Hi,

2008/10/12 Tsing Yue <waywardson@...>:
> Hi,
> I'm a greenhand on programming, and I want to begin my linux programing with a visualization plugin for kaffeine. But I don't know where to start. Could you tell me some stuff such as the interface between kaffeine and it's visualization plugins?
> Thanks.

The visualization plugins are part of xine-lib (xine-lib is a
multimedia library responsible for the actual playback in kaffeine).

Christoph

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel

How to write visualization plugin for kaffeine?

2008-10-11T18:31:50Z

Hi,
I'm a greenhand on programming, and I want to begin my linux programing with a visualization plugin for kaffeine. But I don't know where to start. Could you tell me some stuff such as the interface between kaffeine and it's visualization plugins?
Thanks.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
kaffeine-devel mailing list
kaffeine-devel@...
https://lists.sourceforge.net/lists/listinfo/kaffeine-devel