Nabble - Kaffeine Player

Re: dbus support for kaffeine

2009-11-24T14:54:54Z

Hi Christoph,

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

cheers,
pascal

Pascal schrieb:

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

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

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

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

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

#include <QMetaType>
+#include <QVariantMap>

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

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

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

Q_DECLARE_METATYPE(MprisVersionStruct)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

void checkScreenSaver();

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

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

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

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

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

From forum: kaffeine-devel

Re: Kaffeine Scans, Kaffeine Won't Play

2009-11-23T10:38:15Z

On Mon, 23 Nov 2009, Joel Mayer wrote:

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

Hi Joel,

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

The command:
v4lctl setchannel ##

So:
v4lctl setchannel 10
v4lctl setchannel 11

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

Justin.

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

Nabble - Kaffeine Player

Re: dbus support for kaffeine

Re: Kaffeine Scans, Kaffeine Won't Play

Kaffeine Scans, Kaffeine Won't Play

Re: dbus support for kaffeine

Re: dbus support for kaffeine

Kaffeine 1.0-pre2

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

Re: dbus support for kaffeine

User

[Fwd: dvb-c at-KarrerNet]

Re: dbus support for kaffeine

Request: kaffeine --dvb start parameter

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

Re: kaffeine for kde4: what the?

Re: kaffeine for kde4: what the?

Re: dbus support for kaffeine

kaffeine for kde4: what the?

unsbscribe

Re: dbus support for kaffeine

Important Notice about Reviewboard

Re: dbus support for kaffeine

Re: two kaffeine frequency tables

Re: dbus support for kaffeine

Re: dbus support for kaffeine

two kaffeine frequency tables

Re: dbus support for kaffeine

Re: dbus support for kaffeine

Re: Kaffeine (almost) successful build on mswindows

Re: Kaffeine (almost) successful build on mswindows

Re: Kaffeine (almost) successful build on mswindows

Re: Kaffeine (almost) successful build on mswindows

Re: Kaffeine (almost) successful build on mswindows

Re: [kaffeine-devel] Kaffeine (almost) successful build on mswindows

Re: Kaffeine (almost) successful build on mswindows

Re: [kaffeine-devel] Kaffeine (almost) successful build on mswindows