Conflicts:
	generic-pc/dmx.cpp


Origin commit data
------------------
Branch: master
Commit: f764d6d5e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-10-02 (Tue, 02 Oct 2018)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-10-02 21:58:14 +02:00
57 changed files with 1208 additions and 671 deletions

View File

@@ -64,9 +64,10 @@ static const char *DMX_T[] = {
};
/* map the device numbers. for now only demux0 is used */
#define NUM_DEMUXDEV 1
static const char *devname[NUM_DEMUXDEV] = {
static const char *devname[] = {
"/dev/dvb/adapter0/demux0",
"/dev/dvb/adapter0/demux0",
"/dev/dvb/adapter0/demux0"
};
#define NUM_DEMUX 1
@@ -492,28 +493,12 @@ int cDemux::getUnit(void)
bool cDemux::SetSource(int unit, int source)
{
//lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
//return true;
if (unit >= NUM_DEMUX || unit < 0) {
lt_info_c("%s: unit (%d) out of range, NUM_DEMUX %d\n", __func__, unit, NUM_DEMUX);
return false;
}
lt_info_c("%s(%d, %d) => %d to %d\n", __func__, unit, source, dmx_source[unit], source);
if (source < 0 || source >= NUM_DEMUXDEV)
lt_info_c("%s(%d, %d) ERROR: source %d out of range!\n", __func__, unit, source, source);
else
dmx_source[unit] = source;
lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
return true;
}
int cDemux::GetSource(int unit)
{
//lt_info_c("%s(%d): not implemented yet\n", __func__, unit);
//return 0;
if (unit >= NUM_DEMUX || unit < 0) {
lt_info_c("%s: unit (%d) out of range, NUM_DEMUX %d\n", __func__, unit, NUM_DEMUX);
return -1;
}
lt_info_c("%s(%d) => %d\n", __func__, unit, dmx_source[unit]);
return dmx_source[unit];
lt_info_c("%s(%d): not implemented yet\n", __func__, unit);
return 0;
}