[mythtv-firehose] mythtv/master commit: 0bef56659 by Robert McNamara (rmcnamara)

[MythTV]

      Author:  Robert McNamara <rmcnamara at mythtv.org>
 Change Date:  2011-10-01T16:23:58-07:00
   Push Date:  2011/10/01 16:41:16 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  0bef5665968832ac90d94a46d0748be027d07361
   Changeset:  https://github.com/MythTV/mythtv/commit/0bef56659

Log:

Capture API: Add methods to query configured capture devices.

Also, disambiguate some capture API arguments (Id -> CardId and CardInputId)

Adds the following APIs:

==GetCaptureCardList==

* Returns a list of configured capture devices using the CaptureCardList data contract.
* Takes optional arguments CardType and HostName to filter by those two criteria, otherwise return all capture devices.

Usage:

http://BackendServerIP:6544/Capture/GetCaptureCardList?CardType=HDHOMERUN&HostName=myhost

Return:

<CaptureCardList version="1.0" serializerVersion="1.1">
    <CaptureCards>
        <CaptureCard>
            <CardId>3</CardId>
            <VideoDevice>12345678-0</VideoDevice>
            <AudioDevice/>
            <VBIDevice/>
            <CardType>HDHOMERUN</CardType>
            <DefaultInput>MPEG2TS</DefaultInput>
            <AudioRateLimit>0</AudioRateLimit>
            <HostName>myhost</HostName>
            <DVBSWFilter>0</DVBSWFilter>
            <DVBSatType>0</DVBSatType>
            <DVBWaitForSeqStart>true</DVBWaitForSeqStart>
            <SkipBTAudio>false</SkipBTAudio>
            <DVBOnDemand>false</DVBOnDemand>
            <DVBDiSEqCType>0</DVBDiSEqCType>
            <FirewireSpeed>0</FirewireSpeed>
            <FirewireModel/>
            <FirewireConnection>0</FirewireConnection>
            <SignalTimeout>1000</SignalTimeout>
            <ChannelTimeout>3000</ChannelTimeout>
            <DVBTuningDelay>0</DVBTuningDelay>
            <Contrast>0</Contrast>
            <Brightness>0</Brightness>
            <Colour>0</Colour>
            <Hue>0</Hue>
            <DiSEqCId>0</DiSEqCId>
            <DVBEITScan>true</DVBEITScan>
        </CaptureCard>
    </CaptureCards>
</CaptureCardList>

==GetCaptureCard==

* Returns a single Capture Device, by cardid, using the CaptureCard data contract.
* Takes mandatory argument CardId.

Usage:

http://BackendServerIP:6544/Capture/GetCaptureCard?CardId=1

Return:

<CaptureCard version="1.0" serializerVersion="1.1">
    <CardId>1</CardId>
    <VideoDevice>/dev/dvb/adapter0/frontend0</VideoDevice>
    <AudioDevice/>
    <VBIDevice/>
    <CardType>DVB</CardType>
    <DefaultInput>DVBInput</DefaultInput>
    <AudioRateLimit>0</AudioRateLimit>
    <HostName>myhost</HostName>
    <DVBSWFilter>0</DVBSWFilter>
    <DVBSatType>0</DVBSatType>
    <DVBWaitForSeqStart>true</DVBWaitForSeqStart>
    <SkipBTAudio>false</SkipBTAudio>
    <DVBOnDemand>false</DVBOnDemand>
    <DVBDiSEqCType>0</DVBDiSEqCType>
    <FirewireSpeed>0</FirewireSpeed>
    <FirewireModel/>
    <FirewireConnection>0</FirewireConnection>
    <SignalTimeout>500</SignalTimeout>
    <ChannelTimeout>3000</ChannelTimeout>
    <DVBTuningDelay>0</DVBTuningDelay>
    <Contrast>0</Contrast>
    <Brightness>0</Brightness>
    <Colour>0</Colour>
    <Hue>0</Hue>
    <DiSEqCId>0</DiSEqCId>
    <DVBEITScan>true</DVBEITScan>
</CaptureCard>

Modified:

   mythtv/libs/libmythservicecontracts/datacontracts/captureCard.h
   mythtv/libs/libmythservicecontracts/services/captureServices.h
   mythtv/programs/mythbackend/services/capture.cpp
   mythtv/programs/mythbackend/services/capture.h
   mythtv/programs/mythbackend/services/channel.cpp