diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2011-01-28 11:42:26 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2011-01-28 11:46:53 +0100 |
| commit | c0a60ca49ae1b2384c9bfbeccb1a15e97133d1b2 (patch) | |
| tree | e5502aa00319c1895209eef07f03ef7a212c4a10 /lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h | |
| parent | f32b288b3236e41686e67eda2bccf2f083223bca (diff) | |
| parent | f3060d26bbb98713b901794b6e47bf7f064a9073 (diff) | |
| download | enigma2-experimental-2011.02.tar.gz enigma2-experimental-2011.02.zip | |
Merge branch 'bug_440_dvdplayer_audioselection' into experimental [fixes ##440+441, requires libdreamdvd >=0.10 20110128]experimental-2011.02
Conflicts:
lib/python/Screens/AudioSelection.py
Diffstat (limited to 'lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h index c751a394..80cfcf0c 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h @@ -26,7 +26,7 @@ public: RESULT offlineOperations(const eServiceReference &, ePtr<iServiceOfflineOperations> &ptr); }; -class eServiceDVD: public iPlayableService, public iPauseableService, public iSeekableService, +class eServiceDVD: public iPlayableService, public iPauseableService, public iSeekableService, public iAudioTrackSelection, public iServiceInformation, public iSubtitleOutput, public iServiceKeys, public iCueSheet, public eThread, public Object { friend class eServiceFactoryDVD; @@ -35,7 +35,7 @@ public: virtual ~eServiceDVD(); // not implemented (yet) RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr) { ptr = 0; return -1; } - RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr) { ptr = 0; return -1; } + RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr); RESULT frontendInfo(ePtr<iFrontendInformation> &ptr) { ptr = 0; return -1; } RESULT subServices(ePtr<iSubserviceList> &ptr) { ptr = 0; return -1; } RESULT timeshift(ePtr<iTimeshiftService> &ptr) { ptr = 0; return -1; } @@ -89,8 +89,15 @@ public: void setCutList(SWIG_PYOBJECT(ePyObject)); void setCutListEnable(int enable); - // iServiceKeys + // iAudioTrackSelection + int getNumberOfTracks(); + RESULT selectTrack(unsigned int i); + RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n); + int getCurrentTrack(); + + // iServiceKeys RESULT keyPressed(int key); + private: eServiceDVD(eServiceReference ref); |