diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-05 18:20:55 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-05 18:20:55 +0000 |
commit | d32030ae51012a5bd86f8d0db70ee670114aae1e (patch) | |
tree | 0a4b65f9ca6da9bf2d7a2f41f4d115cce477dd26 /kaffeine/src/input/dvb/dvbstream.h | |
parent | c1aed14da1f321034f34246af4410993cd0e8912 (diff) | |
download | kaffeine-d32030ae51012a5bd86f8d0db70ee670114aae1e.tar.gz kaffeine-d32030ae51012a5bd86f8d0db70ee670114aae1e.zip |
Updated Kaffeine to latest upstream version
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kaffeine@1182813 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kaffeine/src/input/dvb/dvbstream.h')
-rw-r--r-- | kaffeine/src/input/dvb/dvbstream.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h index a5deb52..fe85f04 100644 --- a/kaffeine/src/input/dvb/dvbstream.h +++ b/kaffeine/src/input/dvb/dvbstream.h @@ -62,10 +62,11 @@ public : void setPlug( KaffeineDvbPlugin *p ); QStringList getSources( bool all=false ); bool canSource( ChannelDesc *chan ); + int getPriority(); bool tuneDvb( ChannelDesc *chan, bool dvr=true ); void stopFrontend(); virtual void run(); - int goLive( ChannelDesc *chan, const QString &pipeName ); + int goLive( ChannelDesc *chan, const QString &pipeName, int ringBufSize ); void preStopLive(); void stopLive( ChannelDesc *chan ); void stop(); @@ -89,8 +90,9 @@ public : bool hasLive(); bool liveIsRecording(); int getSNR(); + void probeCam(); + void showCamDialog(); - unsigned char thBuf[188*10]; struct pollfd pfd; DVBevents *dvbEvents; @@ -109,6 +111,7 @@ protected: private : int setDiseqc( int switchPos, ChannelDesc *chan, int hiband, int &rotor, bool dvr ); + void moveRotor( int switchPos, ChannelDesc *chan, int hiband, bool dvr ); void rotorCommand( int cmd, int n1=0, int n2=0, int n3=0 ); void gotoX( double azimuth ); double getAzimuth( double angle ); @@ -119,7 +122,6 @@ private : void removeOut( DVBout *o ); void recordingState(); void startReading(); - void probeCam(); bool openFe(); bool closeFe(); void connectStatus( bool con ); @@ -143,6 +145,7 @@ private : QString timeShiftFileName; DvbCam *cam; bool camProbed; + int diseqcTwice; KaffeineDvbPlugin *plug; signals: |