28 changes: 12 additions & 16 deletions mythtv/libs/libmythtv/tv_rec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ bool TVRec::Init(void)
SetRecordingStatus(rsUnknown, __LINE__);

// configure the Channel instance
QString startchannel = GetStartChannel(cardid, genOpt.defaultinput);
QString startchannel = GetStartChannel(cardid,
CardUtil::GetStartInput(cardid));
if (!CreateChannel(startchannel, true))
return false;

Expand Down Expand Up @@ -1539,7 +1540,7 @@ bool TVRec::GetDevices(uint cardid,
MSqlQuery query(MSqlQuery::InitCon());
query.prepare(
"SELECT videodevice, vbidevice, audiodevice, "
" audioratelimit, defaultinput, cardtype, "
" audioratelimit, cardtype, "
" skipbtaudio, signal_timeout, channel_timeout, "
" dvb_wait_for_seqstart, "
""
Expand Down Expand Up @@ -1576,28 +1577,24 @@ bool TVRec::GetDevices(uint cardid,
gen_opts.audiosamplerate = max(testnum, query.value(3).toInt());

test = query.value(4).toString();
if (test != QString::null)
gen_opts.defaultinput = test;

test = query.value(5).toString();
if (test != QString::null)
gen_opts.cardtype = test;

gen_opts.skip_btaudio = query.value(6).toUInt();
gen_opts.skip_btaudio = query.value(5).toUInt();

gen_opts.signal_timeout = (uint) max(query.value(7).toInt(), 0);
gen_opts.channel_timeout = (uint) max(query.value(8).toInt(), 0);
gen_opts.signal_timeout = (uint) max(query.value(6).toInt(), 0);
gen_opts.channel_timeout = (uint) max(query.value(7).toInt(), 0);

// We should have at least 100 ms to acquire tables...
int table_timeout = ((int)gen_opts.channel_timeout -
(int)gen_opts.signal_timeout);
if (table_timeout < 100)
gen_opts.channel_timeout = gen_opts.signal_timeout + 2500;

gen_opts.wait_for_seqstart = query.value(9).toUInt();
gen_opts.wait_for_seqstart = query.value(8).toUInt();

// DVB options
uint dvboff = 10;
uint dvboff = 9;
dvb_opts.dvb_on_demand = query.value(dvboff + 0).toUInt();
dvb_opts.dvb_tuning_delay = query.value(dvboff + 1).toUInt();
dvb_opts.dvb_eitscan = query.value(dvboff + 2).toUInt();
Expand All @@ -1615,7 +1612,7 @@ bool TVRec::GetDevices(uint cardid,
return true;
}

QString TVRec::GetStartChannel(uint cardid, const QString &defaultinput)
QString TVRec::GetStartChannel(uint cardid, const QString &startinput)
{
QString startchan = QString::null;

Expand All @@ -1627,7 +1624,7 @@ QString TVRec::GetStartChannel(uint cardid, const QString &defaultinput)
"WHERE cardinput.cardid = :CARDID AND "
" inputname = :INPUTNAME");
query.bindValue(":CARDID", cardid);
query.bindValue(":INPUTNAME", defaultinput);
query.bindValue(":INPUTNAME", startinput);

if (!query.exec() || !query.isActive())
{
Expand All @@ -1654,7 +1651,7 @@ QString TVRec::GetStartChannel(uint cardid, const QString &defaultinput)
" capturecard.cardid = :CARDID AND "
" inputname = :INPUTNAME");
query.bindValue(":CARDID", cardid);
query.bindValue(":INPUTNAME", defaultinput);
query.bindValue(":INPUTNAME", startinput);

if (!query.exec() || !query.isActive())
{
Expand Down Expand Up @@ -3295,7 +3292,7 @@ QString TVRec::TuningGetChanNum(const TuningRequest &request,
channum = LiveTVStartChannel;
else
{
input = genOpt.defaultinput;
input = CardUtil::GetStartInput(cardid);
channum = GetStartChannel(cardid, input);
}
}
Expand Down Expand Up @@ -3542,7 +3539,6 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
channel = NULL;

GetDevices(newCardID, genOpt, dvbOpt, fwOpt);
genOpt.defaultinput = inputname;
CreateChannel(channum, false);
}

Expand Down
5 changes: 2 additions & 3 deletions mythtv/libs/libmythtv/tv_rec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class GeneralDBOptions
public:
GeneralDBOptions() :
videodev(""), vbidev(""),
audiodev(""), defaultinput("Television"),
audiodev(""),
cardtype("V4L"),
audiosamplerate(-1), skip_btaudio(false),
signal_timeout(1000), channel_timeout(3000),
Expand All @@ -65,7 +65,6 @@ class GeneralDBOptions
QString videodev;
QString vbidev;
QString audiodev;
QString defaultinput;
QString cardtype;
int audiosamplerate;
bool skip_btaudio;
Expand Down Expand Up @@ -255,7 +254,7 @@ class MTV_PUBLIC TVRec : public SignalMonitorListener, public QRunnable
DVBDBOptions &dvb_opts,
FireWireDBOptions &firewire_opts);

static QString GetStartChannel(uint cardid, const QString &defaultinput);
static QString GetStartChannel(uint cardid, const QString &startinput);

void TeardownRecorder(uint request_flags);
DTVRecorder *GetDTVRecorder(void);
Expand Down
76 changes: 2 additions & 74 deletions mythtv/libs/libmythtv/videosource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -973,24 +973,6 @@ class SkipBtAudio : public CheckBoxSetting, public CaptureCardDBStorage
};
};

class DVBInput : public ComboBoxSetting, public CaptureCardDBStorage
{
public:
DVBInput(const CaptureCard &parent) :
ComboBoxSetting(this),
CaptureCardDBStorage(this, parent, "defaultinput")
{
setLabel(QObject::tr("Default input"));
fillSelections(false);
}

void fillSelections(bool diseqc)
{
clearSelections();
addSelection((diseqc) ? "DVBInput #1" : "DVBInput");
}
};

class DVBCardNum : public ComboBoxSetting, public CaptureCardDBStorage
{
public:
Expand Down Expand Up @@ -1278,7 +1260,6 @@ class FirewireConfigurationGroup : public VerticalConfigurationGroup

addChild(new SignalTimeout(parent, 2000, 1000));
addChild(new ChannelTimeout(parent, 9000, 1750));
addChild(new SingleCardInput(parent));

model->SetGUID(dev->getValue());
desc->SetGUID(dev->getValue());
Expand Down Expand Up @@ -1574,7 +1555,6 @@ class IPTVConfigurationGroup : public VerticalConfigurationGroup
setUseLabel(false);
addChild(new IPTVHost(parent));
addChild(new ChannelTimeout(parent, 3000, 1750));
addChild(new SingleCardInput(parent));
addChild(new EmptyAudioDevice(parent));
addChild(new EmptyVBIDevice(parent));
};
Expand Down Expand Up @@ -1668,16 +1648,13 @@ ASIConfigurationGroup::ASIConfigurationGroup(CaptureCard& a_parent):
parent(a_parent),
device(new ASIDevice(parent)),
cardinfo(new TransLabelSetting()),
input(new TunerCardInput(parent, device->getValue(), "ASI")),
instances(new InstanceCount(parent))
{
addChild(device);
addChild(new EmptyAudioDevice(parent));
addChild(new EmptyVBIDevice(parent));
addChild(cardinfo);
addChild(input);
addChild(instances);
input->setVisible(false);

connect(device, SIGNAL(valueChanged(const QString&)),
this, SLOT( probeCard( const QString&)));
Expand Down Expand Up @@ -1712,7 +1689,6 @@ void ASIConfigurationGroup::probeCard(const QString &device)
return;
}
cardinfo->setValue(tr("Valid DVEO ASI card"));
input->fillSelections(device);
#else
cardinfo->setValue(QString("Not compiled with ASI support"));
#endif
Expand Down Expand Up @@ -1825,8 +1801,6 @@ HDHomeRunConfigurationGroup::HDHomeRunConfigurationGroup
addChild(cardip);
addChild(cardtuner);

addChild(new SingleCardInput(parent));

TransButtonSetting *buttonRecOpt = new TransButtonSetting();
buttonRecOpt->setLabel(tr("Recording Options"));
addChild(buttonRecOpt);
Expand Down Expand Up @@ -2075,8 +2049,6 @@ CetonConfigurationGroup::CetonConfigurationGroup
addChild(deviceid);
addChild(desc);

addChild(new SingleCardInput(parent));

connect(ip, SIGNAL(NewValue(const QString&)),
deviceid, SLOT( SetIP(const QString&)));
connect(card, SIGNAL(NewValue(const QString&)),
Expand All @@ -2096,8 +2068,7 @@ CetonConfigurationGroup::CetonConfigurationGroup
V4LConfigurationGroup::V4LConfigurationGroup(CaptureCard& a_parent) :
VerticalConfigurationGroup(false, true, false, false),
parent(a_parent),
cardinfo(new TransLabelSetting()), vbidev(new VBIDevice(parent)),
input(new TunerCardInput(parent))
cardinfo(new TransLabelSetting()), vbidev(new VBIDevice(parent))
{
QString drv = "(?!ivtv|hdpvr|(saa7164(.*)))";
VideoDevice *device = new VideoDevice(parent, 0, 15, QString::null, drv);
Expand All @@ -2113,7 +2084,6 @@ V4LConfigurationGroup::V4LConfigurationGroup(CaptureCard& a_parent) :
addChild(vbidev);
addChild(new AudioDevice(parent));
addChild(audgrp);
addChild(input);

connect(device, SIGNAL(valueChanged(const QString&)),
this, SLOT( probeCard( const QString&)));
Expand All @@ -2138,16 +2108,14 @@ void V4LConfigurationGroup::probeCard(const QString &device)

cardinfo->setValue(ci);
vbidev->setFilter(cn, dn);
input->fillSelections(device);
}


MPEGConfigurationGroup::MPEGConfigurationGroup(CaptureCard &a_parent) :
VerticalConfigurationGroup(false, true, false, false),
parent(a_parent),
device(NULL), vbidevice(NULL),
cardinfo(new TransLabelSetting()),
input(new TunerCardInput(parent))
cardinfo(new TransLabelSetting())
{
QString drv = "ivtv|(saa7164(.*))";
device = new VideoDevice(parent, 0, 15, QString::null, drv);
Expand All @@ -2159,7 +2127,6 @@ MPEGConfigurationGroup::MPEGConfigurationGroup(CaptureCard &a_parent) :
addChild(device);
addChild(vbidevice);
addChild(cardinfo);
addChild(input);
addChild(new ChannelTimeout(parent, 12000, 2000));

connect(device, SIGNAL(valueChanged(const QString&)),
Expand All @@ -2186,7 +2153,6 @@ void MPEGConfigurationGroup::probeCard(const QString &device)
cardinfo->setValue(ci);
vbidevice->setVisible(dn!="ivtv");
vbidevice->setFilter(cn, dn);
input->fillSelections(device);
}

DemoConfigurationGroup::DemoConfigurationGroup(CaptureCard &a_parent) :
Expand Down Expand Up @@ -2249,7 +2215,6 @@ void DemoConfigurationGroup::probeCard(const QString &device)
HDPVRConfigurationGroup::HDPVRConfigurationGroup(CaptureCard &a_parent) :
VerticalConfigurationGroup(false, true, false, false),
parent(a_parent), cardinfo(new TransLabelSetting()),
videoinput(new TunerCardInput(parent)),
audioinput(new TunerCardAudioInput(parent, QString::null, "HDPVR"))
{
VideoDevice *device =
Expand All @@ -2261,7 +2226,6 @@ HDPVRConfigurationGroup::HDPVRConfigurationGroup(CaptureCard &a_parent) :
addChild(new EmptyAudioDevice(parent));
addChild(new EmptyVBIDevice(parent));
addChild(cardinfo);
addChild(videoinput);
addChild(audioinput);
addChild(new ChannelTimeout(parent, 12000, 2000));

Expand All @@ -2286,7 +2250,6 @@ void HDPVRConfigurationGroup::probeCard(const QString &device)
}

cardinfo->setValue(ci);
videoinput->fillSelections(device);
audioinput->fillSelections(device);
}

Expand Down Expand Up @@ -3744,35 +3707,6 @@ void DVBConfigurationGroup::probeCard(const QString &videodevice)
#endif
}

TunerCardInput::TunerCardInput(const CaptureCard &parent,
QString dev, QString type) :
ComboBoxSetting(this), CaptureCardDBStorage(this, parent, "defaultinput"),
last_device(dev), last_cardtype(type), last_diseqct(-1)
{
setLabel(QObject::tr("Default input"));
int cardid = parent.getCardID();
if (cardid <= 0)
return;

last_cardtype = CardUtil::GetRawCardType(cardid);
last_device = CardUtil::GetVideoDevice(cardid);
}

void TunerCardInput::fillSelections(const QString& device)
{
clearSelections();

if (device.isEmpty())
return;

last_device = device;
QStringList inputs =
CardUtil::ProbeVideoInputs(device, last_cardtype);

for (QStringList::iterator i = inputs.begin(); i != inputs.end(); ++i)
addSelection(*i);
}

TunerCardAudioInput::TunerCardAudioInput(const CaptureCard &parent,
QString dev, QString type) :
ComboBoxSetting(this), CaptureCardDBStorage(this, parent, "audiodevice"),
Expand Down Expand Up @@ -3878,10 +3812,6 @@ DVBConfigurationGroup::DVBConfigurationGroup(CaptureCard& a_parent) :
diseqc_btn->setVisible(false);
addChild(diseqc_cfg);

defaultinput = new DVBInput(parent);
addChild(defaultinput);
defaultinput->setVisible(false);

tuning_delay = new DVBTuningDelay(parent);
addChild(tuning_delay);
tuning_delay->setVisible(false);
Expand Down Expand Up @@ -3909,14 +3839,12 @@ void DVBConfigurationGroup::DiSEqCPanel()

DTVDeviceTreeWizard diseqcWiz(*diseqc_tree);
diseqcWiz.exec();
defaultinput->fillSelections(diseqc_tree->IsInNeedOfConf());
}

void DVBConfigurationGroup::Load(void)
{
VerticalConfigurationGroup::Load();
diseqc_tree->Load(parent.getCardID());
defaultinput->fillSelections(diseqc_tree->IsInNeedOfConf());
if (cardtype->getValue() == "DVB-S" ||
cardtype->getValue() == "DVB-S2" ||
DiSEqCDevTree::Exists(parent.getCardID()))
Expand Down
45 changes: 0 additions & 45 deletions mythtv/libs/libmythtv/videosource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,43 +290,6 @@ class CaptureCardDBStorage : public SimpleDBStorage
const CaptureCard& m_parent;
};

class TunerCardInput : public ComboBoxSetting, public CaptureCardDBStorage
{
Q_OBJECT
public:
TunerCardInput(const CaptureCard &parent,
QString dev = QString::null,
QString type = QString::null);

public slots:
void fillSelections(const QString &device);

private:
QString last_device;
QString last_cardtype;
int last_diseqct;
};

class SingleCardInput : public TunerCardInput
{
Q_OBJECT

public:
SingleCardInput(const CaptureCard &parent) : TunerCardInput(parent)
{
setLabel(QObject::tr("Default input"));
addSelection("MPEG2TS");
setVisible(false);
}

public slots:
void fillSelections(const QString&)
{
clearSelections();
addSelection("MPEG2TS");
}
};

class TunerCardAudioInput : public ComboBoxSetting, public CaptureCardDBStorage
{
Q_OBJECT
Expand Down Expand Up @@ -479,7 +442,6 @@ class V4LConfigurationGroup : public VerticalConfigurationGroup
CaptureCard &parent;
TransLabelSetting *cardinfo;
VBIDevice *vbidev;
TunerCardInput *input;
};

class VideoDevice;
Expand All @@ -500,7 +462,6 @@ class MPEGConfigurationGroup: public VerticalConfigurationGroup
VideoDevice *device;
VBIDevice *vbidevice;
TransLabelSetting *cardinfo;
TunerCardInput *input;
};

class HDPVRConfigurationGroup: public VerticalConfigurationGroup
Expand All @@ -516,11 +477,9 @@ class HDPVRConfigurationGroup: public VerticalConfigurationGroup
private:
CaptureCard &parent;
TransLabelSetting *cardinfo;
TunerCardInput *videoinput;
TunerCardAudioInput *audioinput;
};

class TunerCardInput;
class InstanceCount;
class ASIDevice;

Expand All @@ -538,11 +497,9 @@ class ASIConfigurationGroup: public VerticalConfigurationGroup
CaptureCard &parent;
ASIDevice *device;
TransLabelSetting *cardinfo;
TunerCardInput *input;
InstanceCount *instances;
};

class TunerCardInput;
class InstanceCount;

class ImportConfigurationGroup: public VerticalConfigurationGroup
Expand Down Expand Up @@ -578,7 +535,6 @@ class DemoConfigurationGroup: public VerticalConfigurationGroup
};

class DVBCardNum;
class DVBInput;
class DVBCardName;
class DVBCardType;
class DVBTuningDelay;
Expand All @@ -605,7 +561,6 @@ class DVBConfigurationGroup : public VerticalConfigurationGroup
CaptureCard &parent;

DVBCardNum *cardnum;
DVBInput *defaultinput;
DVBCardName *cardname;
DVBCardType *cardtype;
SignalTimeout *signal_timeout;
Expand Down
94 changes: 45 additions & 49 deletions mythtv/programs/mythbackend/services/capture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DTC::CaptureCardList* Capture::GetCaptureCardList( const QString &sHostName,
"Capture Cards."));

QString str = "SELECT cardid, videodevice, audiodevice, vbidevice, "
"cardtype, defaultinput, audioratelimit, hostname, "
"cardtype, audioratelimit, hostname, "
"dvb_swfilter, dvb_sat_type, dvb_wait_for_seqstart, "
"skipbtaudio, dvb_on_demand, dvb_diseqc_type, "
"firewire_speed, firewire_model, firewire_connection, "
Expand Down Expand Up @@ -92,27 +92,26 @@ DTC::CaptureCardList* Capture::GetCaptureCardList( const QString &sHostName,
pCaptureCard->setAudioDevice ( query.value(2).toString() );
pCaptureCard->setVBIDevice ( query.value(3).toString() );
pCaptureCard->setCardType ( query.value(4).toString() );
pCaptureCard->setDefaultInput ( query.value(5).toString() );
pCaptureCard->setAudioRateLimit ( query.value(6).toUInt() );
pCaptureCard->setHostName ( query.value(7).toString() );
pCaptureCard->setDVBSWFilter ( query.value(8).toUInt() );
pCaptureCard->setDVBSatType ( query.value(9).toUInt() );
pCaptureCard->setDVBWaitForSeqStart( query.value(10).toBool() );
pCaptureCard->setSkipBTAudio ( query.value(11).toBool() );
pCaptureCard->setDVBOnDemand ( query.value(12).toBool() );
pCaptureCard->setDVBDiSEqCType ( query.value(13).toUInt() );
pCaptureCard->setFirewireSpeed ( query.value(14).toUInt() );
pCaptureCard->setFirewireModel ( query.value(15).toString() );
pCaptureCard->setFirewireConnection( query.value(16).toUInt() );
pCaptureCard->setSignalTimeout ( query.value(17).toUInt() );
pCaptureCard->setChannelTimeout ( query.value(18).toUInt() );
pCaptureCard->setDVBTuningDelay ( query.value(19).toUInt() );
pCaptureCard->setContrast ( query.value(20).toUInt() );
pCaptureCard->setBrightness ( query.value(21).toUInt() );
pCaptureCard->setColour ( query.value(22).toUInt() );
pCaptureCard->setHue ( query.value(23).toUInt() );
pCaptureCard->setDiSEqCId ( query.value(24).toUInt() );
pCaptureCard->setDVBEITScan ( query.value(25).toBool() );
pCaptureCard->setAudioRateLimit ( query.value(5).toUInt() );
pCaptureCard->setHostName ( query.value(6).toString() );
pCaptureCard->setDVBSWFilter ( query.value(7).toUInt() );
pCaptureCard->setDVBSatType ( query.value(8).toUInt() );
pCaptureCard->setDVBWaitForSeqStart( query.value(9).toBool() );
pCaptureCard->setSkipBTAudio ( query.value(10).toBool() );
pCaptureCard->setDVBOnDemand ( query.value(11).toBool() );
pCaptureCard->setDVBDiSEqCType ( query.value(12).toUInt() );
pCaptureCard->setFirewireSpeed ( query.value(13).toUInt() );
pCaptureCard->setFirewireModel ( query.value(14).toString() );
pCaptureCard->setFirewireConnection( query.value(15).toUInt() );
pCaptureCard->setSignalTimeout ( query.value(16).toUInt() );
pCaptureCard->setChannelTimeout ( query.value(17).toUInt() );
pCaptureCard->setDVBTuningDelay ( query.value(18).toUInt() );
pCaptureCard->setContrast ( query.value(19).toUInt() );
pCaptureCard->setBrightness ( query.value(20).toUInt() );
pCaptureCard->setColour ( query.value(21).toUInt() );
pCaptureCard->setHue ( query.value(22).toUInt() );
pCaptureCard->setDiSEqCId ( query.value(23).toUInt() );
pCaptureCard->setDVBEITScan ( query.value(24).toBool() );
}

return pList;
Expand All @@ -134,7 +133,7 @@ DTC::CaptureCard* Capture::GetCaptureCard( int nCardId )
"Capture Cards."));

QString str = "SELECT cardid, videodevice, audiodevice, vbidevice, "
"cardtype, defaultinput, audioratelimit, hostname, "
"cardtype, audioratelimit, hostname, "
"dvb_swfilter, dvb_sat_type, dvb_wait_for_seqstart, "
"skipbtaudio, dvb_on_demand, dvb_diseqc_type, "
"firewire_speed, firewire_model, firewire_connection, "
Expand All @@ -160,27 +159,26 @@ DTC::CaptureCard* Capture::GetCaptureCard( int nCardId )
pCaptureCard->setAudioDevice ( query.value(2).toString() );
pCaptureCard->setVBIDevice ( query.value(3).toString() );
pCaptureCard->setCardType ( query.value(4).toString() );
pCaptureCard->setDefaultInput ( query.value(5).toString() );
pCaptureCard->setAudioRateLimit ( query.value(6).toUInt() );
pCaptureCard->setHostName ( query.value(7).toString() );
pCaptureCard->setDVBSWFilter ( query.value(8).toUInt() );
pCaptureCard->setDVBSatType ( query.value(9).toUInt() );
pCaptureCard->setDVBWaitForSeqStart( query.value(10).toBool() );
pCaptureCard->setSkipBTAudio ( query.value(11).toBool() );
pCaptureCard->setDVBOnDemand ( query.value(12).toBool() );
pCaptureCard->setDVBDiSEqCType ( query.value(13).toUInt() );
pCaptureCard->setFirewireSpeed ( query.value(14).toUInt() );
pCaptureCard->setFirewireModel ( query.value(15).toString() );
pCaptureCard->setFirewireConnection( query.value(16).toUInt() );
pCaptureCard->setSignalTimeout ( query.value(17).toUInt() );
pCaptureCard->setChannelTimeout ( query.value(18).toUInt() );
pCaptureCard->setDVBTuningDelay ( query.value(19).toUInt() );
pCaptureCard->setContrast ( query.value(20).toUInt() );
pCaptureCard->setBrightness ( query.value(21).toUInt() );
pCaptureCard->setColour ( query.value(22).toUInt() );
pCaptureCard->setHue ( query.value(23).toUInt() );
pCaptureCard->setDiSEqCId ( query.value(24).toUInt() );
pCaptureCard->setDVBEITScan ( query.value(25).toBool() );
pCaptureCard->setAudioRateLimit ( query.value(5).toUInt() );
pCaptureCard->setHostName ( query.value(6).toString() );
pCaptureCard->setDVBSWFilter ( query.value(7).toUInt() );
pCaptureCard->setDVBSatType ( query.value(8).toUInt() );
pCaptureCard->setDVBWaitForSeqStart( query.value(9).toBool() );
pCaptureCard->setSkipBTAudio ( query.value(10).toBool() );
pCaptureCard->setDVBOnDemand ( query.value(11).toBool() );
pCaptureCard->setDVBDiSEqCType ( query.value(12).toUInt() );
pCaptureCard->setFirewireSpeed ( query.value(13).toUInt() );
pCaptureCard->setFirewireModel ( query.value(14).toString() );
pCaptureCard->setFirewireConnection( query.value(15).toUInt() );
pCaptureCard->setSignalTimeout ( query.value(16).toUInt() );
pCaptureCard->setChannelTimeout ( query.value(17).toUInt() );
pCaptureCard->setDVBTuningDelay ( query.value(18).toUInt() );
pCaptureCard->setContrast ( query.value(19).toUInt() );
pCaptureCard->setBrightness ( query.value(20).toUInt() );
pCaptureCard->setColour ( query.value(21).toUInt() );
pCaptureCard->setHue ( query.value(22).toUInt() );
pCaptureCard->setDiSEqCId ( query.value(23).toUInt() );
pCaptureCard->setDVBEITScan ( query.value(24).toBool() );
}

return pCaptureCard;
Expand Down Expand Up @@ -208,7 +206,6 @@ int Capture::AddCaptureCard ( const QString &sVideoDevice,
const QString &sAudioDevice,
const QString &sVBIDevice,
const QString &sCardType,
const QString &sDefaultInput,
const uint nAudioRateLimit,
const QString &sHostName,
const uint nDVBSWFilter,
Expand All @@ -230,13 +227,12 @@ int Capture::AddCaptureCard ( const QString &sVideoDevice,
const uint nDiSEqCId,
bool bDVBEITScan)
{
if ( sVideoDevice.isEmpty() || sCardType.isEmpty() || sHostName.isEmpty() ||
sDefaultInput.isEmpty() )
if ( sVideoDevice.isEmpty() || sCardType.isEmpty() || sHostName.isEmpty() )
throw( QString( "This API requires at least a video device node, a card type, "
"a default input, and a hostname." ));
"and a hostname." ));

int nResult = CardUtil::CreateCaptureCard(sVideoDevice, sAudioDevice,
sVBIDevice, sCardType, sDefaultInput, nAudioRateLimit,
sVBIDevice, sCardType, nAudioRateLimit,
sHostName, nDVBSWFilter, nDVBSatType, bDVBWaitForSeqStart,
bSkipBTAudio, bDVBOnDemand, nDVBDiSEqCType, nFirewireSpeed,
sFirewireModel, nFirewireConnection, nSignalTimeout,
Expand Down
4 changes: 1 addition & 3 deletions mythtv/programs/mythbackend/services/capture.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class Capture : public CaptureServices
const QString &AudioDevice,
const QString &VBIDevice,
const QString &CardType,
const QString &DefaultInput,
const uint AudioRateLimit,
const QString &HostName,
const uint DVBSWFilter,
Expand Down Expand Up @@ -138,7 +137,6 @@ class ScriptableCapture : public QObject
const QString &AudioDevice,
const QString &VBIDevice,
const QString &CardType,
const QString &DefaultInput,
const uint AudioRateLimit,
const QString &HostName,
const uint DVBSWFilter,
Expand All @@ -161,7 +159,7 @@ class ScriptableCapture : public QObject
bool DVBEITScan)
{
return m_obj.AddCaptureCard( VideoDevice, AudioDevice, VBIDevice, CardType,
DefaultInput, AudioRateLimit, HostName, DVBSWFilter,
AudioRateLimit, HostName, DVBSWFilter,
DVBSatType, DVBWaitForSeqStart, SkipBTAudio, DVBOnDemand,
DVBDiSEqCType, FirewireSpeed, FirewireModel, FirewireConnection,
SignalTimeout, ChannelTimeout, DVBTuningDelay, Contrast, Brightness,
Expand Down
2 changes: 1 addition & 1 deletion mythtv/programs/mythtv-setup/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ int main(int argc, char *argv[])
okCardID &= !inputnames.empty();

if (scanInputName.isEmpty())
scanInputName = CardUtil::GetDefaultInput(scanCardId);
scanInputName = CardUtil::GetStartInput(scanCardId);

bool okInputName = inputnames.contains(scanInputName);

Expand Down