git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[enigma2.git]
/
lib
/
service
/
servicedvb.h
diff --git
a/lib/service/servicedvb.h
b/lib/service/servicedvb.h
index 9ebd277345fad0e28bee25b42f0df09e9ec3eda8..44d920f8d9ef771c9f919ead65e63c046bf8cad4 100644
(file)
--- a/
lib/service/servicedvb.h
+++ b/
lib/service/servicedvb.h
@@
-25,7
+25,9
@@
private:
RESULT lookupService(ePtr<eDVBService> &ptr, const eServiceReference &ref);
};
RESULT lookupService(ePtr<eDVBService> &ptr, const eServiceReference &ref);
};
-class eDVBServiceList: public iListableService
+class eBouquet;
+
+class eDVBServiceList: public iListableService, public iMutableServiceList
{
DECLARE_REF(eDVBServiceList);
public:
{
DECLARE_REF(eDVBServiceList);
public:
@@
-33,15
+35,26
@@
public:
RESULT getContent(std::list<eServiceReference> &list);
RESULT getNext(eServiceReference &ptr);
int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
RESULT getContent(std::list<eServiceReference> &list);
RESULT getNext(eServiceReference &ptr);
int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
+
+ RESULT startEdit(ePtr<iMutableServiceList> &);
+ RESULT flushChanges();
+ RESULT addService(eServiceReference &ref);
+ RESULT removeService(eServiceReference &ref);
+ RESULT moveService(eServiceReference &ref, int pos);
private:
RESULT startQuery();
eServiceReference m_parent;
friend class eServiceFactoryDVB;
eDVBServiceList(const eServiceReference &parent);
ePtr<iDVBChannelListQuery> m_query;
private:
RESULT startQuery();
eServiceReference m_parent;
friend class eServiceFactoryDVB;
eDVBServiceList(const eServiceReference &parent);
ePtr<iDVBChannelListQuery> m_query;
+
+ /* for editing purposes. WARNING: lifetime issue! */
+ eBouquet *m_bouquet;
};
};
-class eDVBServicePlay: public iPlayableService, public iPauseableService, public iSeekableService, public Object, public iServiceInformation
+class eDVBServicePlay: public iPlayableService, public iPauseableService,
+ public iSeekableService, public Object, public iServiceInformation,
+ public iAudioTrackSelection
{
DECLARE_REF(eDVBServicePlay);
public:
{
DECLARE_REF(eDVBServicePlay);
public:
@@
-54,6
+67,7
@@
public:
RESULT seek(ePtr<iSeekableService> &ptr);
RESULT pause(ePtr<iPauseableService> &ptr);
RESULT info(ePtr<iServiceInformation> &ptr);
RESULT seek(ePtr<iSeekableService> &ptr);
RESULT pause(ePtr<iPauseableService> &ptr);
RESULT info(ePtr<iServiceInformation> &ptr);
+ RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
// iPauseableService
RESULT pause();
// iPauseableService
RESULT pause();
@@
-68,6
+82,13
@@
public:
// iServiceInformation
RESULT getName(std::string &name);
RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
// iServiceInformation
RESULT getName(std::string &name);
RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
+ int getInfo(int w);
+ std::string getInfoString(int w);
+
+ // iAudioTrackSelection
+ int getNumberOfTracks();
+ RESULT selectTrack(unsigned int i);
+ RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
private:
friend class eServiceFactoryDVB;
private:
friend class eServiceFactoryDVB;
@@
-88,6
+109,9
@@
private:
Signal2<void,iPlayableService*,int> m_event;
int m_is_pvr, m_is_paused;
Signal2<void,iPlayableService*,int> m_event;
int m_is_pvr, m_is_paused;
+
+ int m_current_audio_stream;
+ int selectAudioStream(int n);
};
#endif
};
#endif