Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Unhide some recorder,channel methods.
  • Loading branch information
daniel-kristjansson committed Jun 28, 2012
1 parent 1c5ed68 commit c10829b
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 0 deletions.
63 changes: 63 additions & 0 deletions mythtv/libs/libmythtv/iptvchannel.h
@@ -0,0 +1,63 @@
/** -*- Mode: c++ -*-
* IPTVChannel
* Copyright (c) 2006 by Laurent Arnal, Benjamin Lerman & Mickaël Remars
* Distributed as part of MythTV under GPL v2 and later.
*/

#ifndef _IPTV_CHANNEL_H_
#define _IPTV_CHANNEL_H_

#include <QString>
#include <QMutex>

#include "dtvchannel.h"
#include "iptvchannelinfo.h"

class IPTVFeederWrapper;

class IPTVChannel : public DTVChannel
{
friend class IPTVSignalMonitor;
friend class IPTVRecorder;

public:
IPTVChannel(TVRec *parent, const QString &videodev);
~IPTVChannel();

// Commands
bool Open(void);
void Close(void);
bool SetChannelByString(const QString &channum);

// Gets
bool IsOpen(void) const;

// Channel scanning stuff
using DTVChannel::Tune;
bool Tune(const DTVMultiplex&, QString) { return true; }

private:
IPTVChannelInfo GetCurrentChanInfo(void) const
{ return GetChanInfo(m_curchannelname); }

IPTVFeederWrapper *GetFeeder(void) { return m_feeder; }
const IPTVFeederWrapper *GetFeeder(void) const { return m_feeder; }

IPTVChannelInfo GetChanInfo(
const QString &channum, uint sourceid = 0) const;

private:
QString m_videodev;
fbox_chan_map_t m_freeboxchannels;
IPTVFeederWrapper *m_feeder;
mutable QMutex m_lock;

private:
IPTVChannel &operator=(const IPTVChannel&); //< avoid default impl
IPTVChannel(const IPTVChannel&); //< avoid default impl
IPTVChannel(); //< avoid default impl
};

#endif // _IPTV_CHANNEL_H_

/* vim: set expandtab tabstop=4 shiftwidth=4: */
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/recorders/asirecorder.h
Expand Up @@ -61,6 +61,7 @@ class ASIRecorder : public DTVRecorder
const QString &videodev,
const QString &audiodev,
const QString &vbidev);
using DTVRecorder::SetOption;
void SetOption(const QString &name, int value);

void run(void);
Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/recorders/cetonchannel.h
Expand Up @@ -39,6 +39,7 @@ class CetonChannel : public DTVChannel
// Sets
virtual bool SetChannelByString(const QString &channum);

using DTVChannel::Tune;
// ATSC/DVB scanning/tuning stuff
bool Tune(const DTVMultiplex &tuning, QString inputname);

Expand Down
2 changes: 2 additions & 0 deletions mythtv/libs/libmythtv/recorders/dvbchannel.h
Expand Up @@ -78,8 +78,10 @@ class DVBChannel : public DTVChannel
double GetUncorrectedBlockCount(bool *ok = NULL) const;

// Commands
using DTVChannel::SwitchToInput;
bool SwitchToInput(const QString &inputname, const QString &chan);
bool SwitchToInput(int newcapchannel, bool setstarting);
using DTVChannel::Tune;
bool Tune(const DTVMultiplex &tuning, QString inputname);
bool Tune(const DTVMultiplex &tuning, uint inputid,
bool force_reset = false, bool same_input = false);
Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/recorders/firewirechannel.h
Expand Up @@ -25,6 +25,7 @@ class FirewireChannel : public DTVChannel
virtual bool Open(void);
virtual void Close(void);

using DTVChannel::Tune;
virtual bool Tune(const DTVMultiplex&, QString) { return false; }
virtual bool Tune(const QString &freqid, int finetune);
virtual bool Retune(void);
Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/recorders/hdhrchannel.h
Expand Up @@ -40,6 +40,7 @@ class HDHRChannel : public DTVChannel
// Sets
virtual bool SetChannelByString(const QString &channum);

using DTVChannel::Tune;
// ATSC/DVB scanning/tuning stuff
bool Tune(const DTVMultiplex &tuning, QString inputname);

Expand Down
1 change: 1 addition & 0 deletions mythtv/libs/libmythtv/recorders/v4lchannel.h
Expand Up @@ -38,6 +38,7 @@ class V4LChannel : public DTVChannel
bool Init(QString &inputname, QString &startchannel, bool setchan);

// Commands
using DTVChannel::SwitchToInput;
bool SwitchToInput(int newcapchannel, bool setstarting);
bool Open(void);
void Close(void);
Expand Down

0 comments on commit c10829b

Please sign in to comment.