diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/configure mythtv-current-dbox2/configure --- mythtv-current/configure 2005-08-02 20:05:21.000000000 +0200 +++ mythtv-current-dbox2/configure 2005-08-02 15:54:33.000000000 +0200 @@ -47,6 +47,7 @@ lirc="yes" joystick_menu="yes" firewire_cable_box="yes" +dbox2_dvb_box="yes" x11="yes" xrandr="yes" xv="yes" @@ -163,6 +164,7 @@ echo " --disable-lirc disable lirc support (Infrared Remotes)" echo " --disable-joystick-menu disable joystick menu" echo " --disable-firewire disable support for FireWire cable boxes" +echo " --disable-dbox2 disable support for Nokia DBOX2 DVB boxes (or compatibles)" echo " --disable-v4l disable Video4Linux support" echo " --disable-ivtv disable ivtv support (PVR-x50) req. v4l support" #echo " --enable-ivtv-sys-header use ivtv system headers instead of myth headers" @@ -724,6 +726,10 @@ ;; --disable-firewire) firewire_cable_box="no" ;; + --enable-dbox2) dbox2_dvb_box="yes" + ;; + --disable-dbox2) dbox2_dvb_box="no" + ;; --enable-dvb) dvb="yes" ;; --disable-dvb) dvb="no" @@ -2540,6 +2546,11 @@ echo "CONFIG_FIREWIRE_LIBS=-lraw1394 -liec61883 -lavc1394" >> $MYTH_CONFIG_MAK fi +if test x"$dbox2_dvb_box" = x"yes" ; then + CCONFIG="$CCONFIG using_dbox2" + CONFIG_DEFINES="$CONFIG_DEFINES USING_DBOX2" +fi + if test x"$lirc" = x"yes" ; then CCONFIG="$CCONFIG using_lirc" echo "CONFIG_LIRC_LIBS=-llirc_client" >> $MYTH_CONFIG_MAK diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/docs/mythtv-HOWTO.sgml mythtv-current-dbox2/docs/mythtv-HOWTO.sgml --- mythtv-current/docs/mythtv-HOWTO.sgml 2005-07-29 16:05:29.000000000 +0200 +++ mythtv-current-dbox2/docs/mythtv-HOWTO.sgml 2005-07-29 16:06:15.000000000 +0200 @@ -471,6 +471,10 @@ Firewire.

You may use the Firewire output of the DCT6200 or the SA3250. +DBoxII or other devices running Neutrino +

You may use the Ethernet port of an DBoxII or a similar device to capture +MPEG2. Your set top box has to be running the Neutrino GUI. + USB Capture Devices.

The Plextor ConvertX PVR devices are supported through Linux drivers available from growisofs -Z /dev/scd0 -dvd-video DVD +Using the DBoxII within MythTV +

The configuration of the DBoxII for use within MythTV is tricky +(as of May 16 2005), that's why it's covered here. Your DBoxII has to be +running linux and the Neutrino GUI instead of the stock BetaNova firmware. +For further information, please refer to . Additionally, you need to enable the SPTS mode in +Neutrino. + +1.) Add a new "Capture Card" in the setup. The "Card type" is "DBOX2 Input", +the other values have to be adjusted according to your setup. +The default values, except for the "DBOX2 host ip", should work fine. +2.) Define a new video source. It doesn't need to be configured, +you just need to define it. MythTV grabs the EPG from the DBoxII. +3.) Connect the DBoxII to the newly defined input source in "input connections". +4.) Since channel scanning is not implemented yet, you need to define channels +in the "Channel Editor". Make sure that you use the same value for +"Channel Name" as on the DBoxII. You can get a list of available +channels from the web interface of Neutrino at http://ip-of-your-box:80/. +Associate the channel with your new video source and repeat when needed. + +You may leave the Setup now and proceed as usual. Migrating from XMLTV to DataDirect diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbcheck.cpp mythtv-current-dbox2/libs/libmythtv/dbcheck.cpp --- mythtv-current/libs/libmythtv/dbcheck.cpp 2005-07-29 16:05:53.000000000 +0200 +++ mythtv-current-dbox2/libs/libmythtv/dbcheck.cpp 2005-07-29 19:21:25.000000000 +0200 @@ -10,7 +10,7 @@ #include "mythdbcon.h" /// This is the DB schema version expected by the running MythTV instance. -const QString currentDatabaseVersion = "1089"; +const QString currentDatabaseVersion = "1090"; static bool UpdateDBVersionNumber(const QString &newnumber); static bool performActualUpdate(const QString updates[], QString version, @@ -1977,6 +1977,20 @@ return false; } + if (dbver == "1089") + { + const QString updates[] = { + "INSERT INTO profilegroups SET name = 'DBOX2 Input', cardtype = 'DBOX2', is_default = 1;", + "ALTER TABLE capturecard ADD COLUMN dbox2_port INT UNSIGNED NOT NULL DEFAULT 31338;", + "ALTER TABLE capturecard ADD COLUMN dbox2_httpport INT UNSIGNED NOT NULL DEFAULT 80;", + "ALTER TABLE capturecard ADD COLUMN dbox2_host varchar(32) NULL;", + "" + }; + + if (!performActualUpdate(updates, "1090", dbver)) + return false; + } + // Drop xvmc_buffer_settings at some point // Drop dead DVB tables eventually, too diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbox2channel.cpp mythtv-current-dbox2/libs/libmythtv/dbox2channel.cpp --- mythtv-current/libs/libmythtv/dbox2channel.cpp 1970-01-01 01:00:00.000000000 +0100 +++ mythtv-current-dbox2/libs/libmythtv/dbox2channel.cpp 2005-07-29 18:51:55.000000000 +0200 @@ -0,0 +1,335 @@ +/** + * DBox2Channel + * Copyright (c) 2005 by Levent Gündogdu + * Distributed as part of MythTV under GPL v2 and later. + */ + + +#include +#include +#include "mythdbcon.h" +#include "mythcontext.h" +#include "dbox2channel.h" + +//#define DBOX2_CHANNEL_DEBUG + +DBox2Channel::DBox2Channel(TVRec *parent, dbox2_options_t *dbox2_options, int cardid): ChannelBase(parent) { + m_dbox2options = dbox2_options; + m_cardid = cardid; + m_dbox2channelcount = 0; + m_lastChannel = "1"; + m_requestChannel = ""; + m_channelListReady = false; + capchannels = 1; + channelnames[0] = "DBOX2"; + // Create EPG + m_epg = new DBox2EPG(); + m_recorderAlive = false; + // Create http + http = new QHttp(); + httpChanger = new QHttp(); + // Connect signals + connect (http, SIGNAL(done(bool)), this, SLOT(HttpRequestDone(bool))); + connect (httpChanger, SIGNAL(done(bool)), this, SLOT(HttpChannelChangeDone(bool))); + connect (m_epg, SIGNAL(EPGFinished()), this, SLOT(EPGFinished())); + // Load channel names and ids from the dbox + LoadChannels(); +} + +DBox2Channel::~DBox2Channel(void) +{ + // Shutdown EPG + disconnect (m_epg, SIGNAL(EPGFinished()), this, SLOT(EPGFinished())); + m_epg->Shutdown(); + delete m_epg; + // Abort pending channel changes + httpChanger->abort(); + httpChanger->closeConnection(); + disconnect (httpChanger, SIGNAL(done(bool)), this, SLOT(httpChannelChangeDone(bool))); + // Abort pending channel list requests + http->abort(); + http->closeConnection(); + disconnect (http, SIGNAL(done(bool)), this, SLOT(httpRequestDone(bool))); + delete http; +} + +void DBox2Channel::SwitchToLastChannel() +{ + Log(QString("Switching to last channel %1.").arg(m_lastChannel)); + SetChannelByString(m_lastChannel); +} + +bool DBox2Channel::SetChannelByString(const QString &newChan) { + // Delay set channel when list has not yet been retrieved + if (!m_channelListReady) + { + Log(QString("Channel list not received yet. Will switch to channel %1 later...").arg(newChan)); + m_requestChannel = newChan; + return true; + } + QString chan = newChan; + if (chan == "") + { + Log(QString("Empty channel name has been provided. Getting default name.")); + chan = GetDefaultChannel(); + } + Log(QString("Changing to %1.").arg(chan)); + if (m_lastChannel != curchannelname) + m_lastChannel = curchannelname; + curchannelname = chan; + + // Zap DBox2 to requested channel + // Find channel name from channel number + QString channelName = GetChannelNameFromNumber(chan); + if (channelName == "") + { + Log(QString("Changing to %1 failed. Channel not found!").arg(chan)); + QString defaultChannel = GetDefaultChannel(); + if (defaultChannel != chan) + { + Log(QString("Trying default channel %1").arg(defaultChannel)); + return SetChannelByString(defaultChannel); + } + return false; + } + + // Find dbox2 channel id from channel name + QString channelID = GetChannelID(channelName); + if (channelID == "") + { + Log(QString("Changing to %1 failed. DBox2 channel ID for name %2 not found!").arg(chan).arg(channelName)); + QString defaultChannel = GetDefaultChannel(); + if (defaultChannel != chan) + { + Log(QString("Trying default channel %1").arg(defaultChannel)); + return SetChannelByString(defaultChannel); + } + return false; + } + + Log(QString("Channel ID for %1 is %2.").arg(chan).arg(channelID)); + + // Request channel change + ChannelChanging(); + RequestChannelChange(channelID); + return true; +} + +bool DBox2Channel::Open() { + Log(QString("Channel instantiated.")); + return true; +} +void DBox2Channel::Close() { + Log(QString("Channel destructed.")); +} + +void DBox2Channel::SwitchToInput(const QString &input, const QString &chan) +{ + currentcapchannel = 0; + if (channelnames.empty()) + channelnames[currentcapchannel] = input; + + SetChannelByString(chan); +} + +void DBox2Channel::LoadChannels() { + Log(QString("Loading channels...")); + Log(QString("Reading channel list from %1:%2") + .arg(m_dbox2options->host) + .arg(m_dbox2options->httpport)); + + // Request Channel list via http. Signal will be emmitted when list is ready. + QHttpRequestHeader header("GET", "/control/channellist"); + header.setValue("Host", m_dbox2options->host); + http->setHost(m_dbox2options->host, m_dbox2options->httpport); + http->request(header); +} + +void DBox2Channel::HttpRequestDone(bool error) +{ + if (error) + { + Log(QString("Reading channel list failed!")); + return; + } + + QString buffer=http->readAll(); + Log(QString("Reading channel list succeeded.")); + m_dbox2channelcount = 0; + while (true) + { + QString line = buffer.section("\n", m_dbox2channelcount, m_dbox2channelcount); + if (line == "") + break; + m_dbox2channelids[m_dbox2channelcount] = line.section(" ", 0, 0); + m_dbox2channelnames[m_dbox2channelcount] = line.section(" ", 1, 5); +#ifdef DBOX2_CHANNEL_DEBUG + Log(QString("Found Channel %1.").arg(m_dbox2channelnames[m_dbox2channelcount])); +#endif + m_dbox2channelcount++; + } + Log(QString("Read %1 channels.").arg(m_dbox2channelcount)); + + // Initialize EPG + m_epg->Init(m_dbox2options, m_cardid, this); + + // Channel list is ready. + m_channelListReady = true; + // Change channel if request available + if (m_requestChannel != "") + { + SetChannelByString(m_requestChannel); + m_requestChannel = ""; + } +} + +void DBox2Channel::RequestChannelChange(QString channelID) +{ + // Prepare request + QString requestString; + requestString = QString("/control/zapto?%1").arg(channelID); + + Log(QString("Changing channel on %1:%2 to channel id %3: %4") + .arg(m_dbox2options->host) + .arg(m_dbox2options->httpport) + .arg(channelID) + .arg(requestString)); + + // Request channel change via http. Signal will be emmited when request is done. + QHttpRequestHeader header("GET", requestString); + header.setValue("Host", m_dbox2options->host); + httpChanger->setHost(m_dbox2options->host, m_dbox2options->httpport); + httpChanger->request(header); +} + +void DBox2Channel::HttpChannelChangeDone(bool error) +{ + if (error) + { + Log(QString("Changing channel failed!")); + return; + } + + QString buffer=httpChanger->readAll(); + QString line = buffer; + if (line == "ok") + { + Log(QString("Changing channel succeeded...")); + // Send signal to record that channel has changed. + ChannelChanged(); + // Request EPG for this channel if recorder is not alive + if (!m_recorderAlive) + m_epg->ScheduleRequestEPG(curchannelname); + return; + } + + Log(QString("Changing channel failed: %1.").arg(line)); + return; +} + +QString DBox2Channel::GetChannelID(const QString& name) +{ + for (int i = m_dbox2channelcount-1; i >= 0; i--) + if (m_dbox2channelnames[i].upper() == name.upper()) + return m_dbox2channelids[i]; + return ""; +} + +QString DBox2Channel::GetChannelNameFromNumber(const QString& channelnumber) +{ + MSqlQuery query(MSqlQuery::InitCon()); + query.prepare("SELECT name " + "FROM channel,cardinput " + "WHERE " + "channel.sourceid = cardinput.sourceid AND " + "cardinput.cardid = :CARDID AND " + "channel.channum = :CHANNUM"); + query.bindValue(":CARDID", m_cardid); + query.bindValue(":CHANNUM", channelnumber); + + if (query.exec() && query.isActive() && query.size() > 0) + { + query.next(); + return query.value(0).toString(); + } + return ""; +} + +QString DBox2Channel::GetChannelNumberFromName(const QString& channelName) +{ + Log(QString("Getting channel number from channel %1.").arg(channelName)); + + MSqlQuery query(MSqlQuery::InitCon()); + query.prepare("SELECT channum " + "FROM channel, cardinput " + "WHERE " + "channel.sourceid = cardinput.sourceid AND " + "cardinput.cardid = :CARDID AND " + "channel.name = :NAME"); + query.bindValue(":CARDID", m_cardid); + query.bindValue(":NAME", channelName); + + if (query.exec() && query.isActive() && query.size() > 0) + { + query.next(); + return query.value(0).toString(); + } + Log(QString("Channel number from channel %1 is unknown.").arg(channelName)); + return ""; +} + +QString DBox2Channel::GetDefaultChannel() +{ + MSqlQuery query(MSqlQuery::InitCon()); + query.prepare("SELECT channum " + "FROM channel,cardinput " + "WHERE " + "channel.sourceid = cardinput.sourceid AND " + "cardinput.cardid = :CARDID " + "ORDER BY channum limit 1"); + query.bindValue(":CARDID", m_cardid); + + if (query.exec() && query.isActive() && query.size() > 0) + { + query.next(); + return query.value(0).toString(); + } + return ""; +} + +void DBox2Channel::Log(QString string) +{ + VERBOSE(VB_IMPORTANT,QString("DBOX#%1: %2").arg(m_cardid).arg(string)); +} + +void DBox2Channel::RecorderAlive(bool alive) +{ + if (m_recorderAlive == alive) + return; + + m_recorderAlive = alive; + if (m_recorderAlive) + Log("Recorder now online. Deactivating EPG scan"); + else + { + Log("Recorder now offline. Reactivating EPG scan"); + ScanNextEPG(); + } +} + +void DBox2Channel::EPGFinished() +{ + // Switch to next channel to retrieve EPG + if (m_recorderAlive) + Log("EPG finished. Recorder still online. Deactivating EPG scan"); + else + { + Log("EPG finished. Recorder still offline. Continuing EPG scan"); + ScanNextEPG(); + } +} + +void DBox2Channel::ScanNextEPG() +{ + SetChannelByDirection(CHANNEL_DIRECTION_UP); +} diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbox2channel.h mythtv-current-dbox2/libs/libmythtv/dbox2channel.h --- mythtv-current/libs/libmythtv/dbox2channel.h 1970-01-01 01:00:00.000000000 +0100 +++ mythtv-current-dbox2/libs/libmythtv/dbox2channel.h 2005-07-29 18:51:48.000000000 +0200 @@ -0,0 +1,81 @@ +/** + * Dbox2Channel + * Copyright (c) 2005 by Levent Gündogdu + * Distributed as part of MythTV under GPL v2 and later. + */ + + +#ifndef DBOX2CHANNEL_H +#define DBOX2CHANNEL_H + +#include +#include +#include "tv_rec.h" +#include "channelbase.h" +#include "sitypes.h" +#include "dbox2epg.h" + +class DBox2EPG; + +typedef struct dbox2channel +{ + pthread_mutex_t lock; +} dbox2_channel_t; + +class DBox2Channel : public QObject, public ChannelBase +{ + Q_OBJECT + public: + DBox2Channel(TVRec *parent, dbox2_options_t *dbox2_options, int cardid); + ~DBox2Channel(void); + + bool SetChannelByString(const QString &chan); + bool Open(); + bool IsOpen(void) const { return m_recorderAlive; } + void Close(); + void SwitchToLastChannel(); + void SwitchToInput(const QString &inputname, const QString &chan); + void SwitchToInput(int newcapchannel, bool setstarting) + { (void)newcapchannel; (void)setstarting; } + + QString GetChannelNameFromNumber(const QString&); + QString GetChannelNumberFromName(const QString& channelName); + QString GetChannelID(const QString&); + + void RecorderAlive(bool); + + int GetFd() { return -1; } + + signals: + void ChannelChanged(); + void ChannelChanging(); + + public slots: + void HttpChannelChangeDone(bool error); + void HttpRequestDone(bool error); + void EPGFinished(); + + private: + void Log(QString string); + void LoadChannels(); + void RequestChannelChange(QString); + void ScanNextEPG(); + QString GetDefaultChannel(); + dbox2_options_t *m_dbox2options; + int m_cardid; + bool m_channelListReady; + QString m_lastChannel; + QString m_requestChannel; + DBox2EPG* m_epg; + bool m_recorderAlive; + + QHttp *http; + QHttp *httpChanger; + + int m_dbox2channelcount; + map m_dbox2channelids; + map m_dbox2channelnames; + +}; + +#endif diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbox2epg.cpp mythtv-current-dbox2/libs/libmythtv/dbox2epg.cpp --- mythtv-current/libs/libmythtv/dbox2epg.cpp 1970-01-01 01:00:00.000000000 +0100 +++ mythtv-current-dbox2/libs/libmythtv/dbox2epg.cpp 2005-07-29 16:06:15.000000000 +0200 @@ -0,0 +1,247 @@ +/** + * DBox2EPG + * Copyright (c) 2005 by Levent Gündogdu (mythtv@feature-it.com) + * Distributed as part of MythTV under GPL v2 and later. + */ + +#include +#include "dbox2epg.h" +#include "mythdbcon.h" + +#define DEBUG_DBOX2EPG +//#define DEBUG_DBOX2EPG_SHOWS +//#define DEBUG_DBOX2EPG_PARSER + +DBox2EPG::DBox2EPG() +{ + http = new QHttp(); + connect (http, SIGNAL(requestFinished(int, bool)), this, SLOT(httpRequestFinished(int,bool))); + m_isRunning = true; + m_dbox2channel = NULL; +} + +DBox2EPG::~DBox2EPG() +{ + // Abort any pending http operation + http->abort(); + http->closeConnection(); + // Disconnect from http + disconnect (http, SIGNAL(requestFinished(int, bool)), this, SLOT(httpRequestFinished(int,bool))); + // Delete http + delete http; +} + +void DBox2EPG::Init(dbox2_options_t* dbox2_options, int cardid, DBox2Channel* channel) +{ + m_dbox2options = dbox2_options; + http->setHost(m_dbox2options->host, m_dbox2options->httpport); + m_dbox2channel = channel; + m_cardid = cardid; +#ifdef DEBUG_DBOX2EPG + VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Initing.").arg(m_cardid)); +#endif + start(); +} + +void DBox2EPG::Shutdown() +{ + m_isRunning = false; +} + +void DBox2EPG::run() +{ +#ifdef DEBUG_DBOX2EPG + VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Starting Thread....").arg(m_cardid)); +#endif + long waitTime = 15 * 1000 * 1000; + + // Process all channel ids and retrieve EPG + while (m_isRunning) + { + usleep(1000); + + // If operation is in progress, do not request epg + if (!m_pendingRequest) + continue; + + // Wait before processing + usleep(waitTime); + + RequestEPG(m_requestedChannel); + m_pendingRequest = false; + } +#ifdef DEBUG_DBOX2EPG + VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Exiting Thread....").arg(m_cardid)); +#endif +} + + +void DBox2EPG::ScheduleRequestEPG(const QString& channelNumber) +{ + m_requestedChannel = channelNumber; + m_pendingRequest = true; +} + +void DBox2EPG::RequestEPG(const QString& channelNumber) +{ + // Prepare request + QString requestString; + QString channelName = m_dbox2channel->GetChannelNameFromNumber(channelNumber); + QString dbox2ChannelID = m_dbox2channel->GetChannelID(channelName); + requestString = QString("/control/epg?id=%1").arg(dbox2ChannelID); + + VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Requesting EPG for channel %2 (%3): %4%5") + .arg(m_cardid) + .arg(channelNumber) + .arg(channelName) + .arg(m_dbox2options->host) + .arg(requestString)); + + // Request EPG via http. Signal will be emmited when request is done. + QHttpRequestHeader header("GET", requestString); + header.setValue("Host", m_dbox2options->host); + m_currentEPGRequestChannel = channelNumber; + m_currentEPGRequestID = http->request(header); +} + + +void DBox2EPG::UpdateDataBase(QString* chanID, QDateTime* startTime, QDateTime* endTime, QString* title, QString *description, QString *category) +{ + MSqlQuery query(MSqlQuery::InitCon()); + + // This used to be REPLACE INTO... + // primary key of table program is chanid,starttime + query.prepare("DELETE FROM program" + " WHERE chanid = :CHANID" + " AND starttime = :STARTTIME ;"); + query.bindValue(":CHANID", chanID->toInt()); + query.bindValue(":STARTTIME", startTime->toString("yyyyMMddhhmmss")); + if (!query.exec()) + MythContext::DBError("Saving program", + query); + + query.prepare("INSERT INTO program (chanid,starttime,endtime," + " title,subtitle,description,category,airdate," + " stars) VALUES (:CHANID,:STARTTIME,:ENDTIME,:TITLE," + " :SUBTITLE,:DESCRIPTION,:CATEGORY,:AIRDATE,:STARS);"); + query.bindValue(":CHANID", chanID->toInt()); + query.bindValue(":STARTTIME", startTime->toString("yyyyMMddhhmmss")); + query.bindValue(":ENDTIME", endTime->toString("yyyyMMddhhmmss")); + query.bindValue(":TITLE", title->utf8()); + query.bindValue(":SUBTITLE", ""); + query.bindValue(":DESCRIPTION", description->utf8()); + query.bindValue(":CATEGORY", category->utf8()); + query.bindValue(":AIRDATE", "0"); + query.bindValue(":STARS", "0"); + + if (!query.exec()) + MythContext::DBError("Saving program", + query); +} + +/** + * + * Reads the results and updates the database accordingly. + * Will be called by the HTTP Object once a request has been finished. + * + */ + +void DBox2EPG::httpRequestFinished(int requestID, bool error) +{ + if (error) + { + VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Reading EPG failed.").arg(m_cardid)); + EPGFinished(); + return; + } + + if (requestID != m_currentEPGRequestID) + { +#ifdef DEBUG_DBOX2EPG + VERBOSE(VB_IMPORTANT, QString("DBOXEPG#%1: Got EPG for old channel. Ignoring").arg(m_cardid)); +#endif + return; + } + + QByteArray buffer=http->readAll(); +#ifdef DEBUG_DBOX2EPG + VERBOSE(VB_GENERAL,QString("DBOXEPG#%1: EPG received. Parsing %2 bytes...").arg(m_cardid).arg(buffer.size())); +#endif + + QString channelID = GetChannelID(m_currentEPGRequestChannel); + + // Parse + int showCount = 0; + int index = 0; + int size = buffer.size(); + while (index < size) + { + // Next section must not start with an empty line + QString line = ParseNextLine(buffer, &index, size); + if (line == "") + continue; + QString epgID = line.section(" ", 0, 0); + QDateTime startTime; + startTime.setTime_t(line.section(" ", 1, 1).toInt()); + QDateTime endTime; + endTime = startTime.addSecs(line.section(" ", 2, 2).toInt()); + QString title = ParseNextLine(buffer, &index, size); + QString category = ParseNextLine(buffer, &index, size); + QString description = ParseNextLine(buffer, &index, size); + // Update database +#ifdef DEBUG_DBOX2EPG_SHOWS + VERBOSE(VB_GENERAL,QString("DBOXEPG#%1: Found show. Start Time: %1, End Time: %2, Title: %3, Description: %4.") + .arg(m_cardid) + .arg(startTime.toString()) + .arg(endTime.toString()) + .arg(title) + .arg(description)); +#endif + UpdateDataBase(&channelID, &startTime, &endTime, &title, &description, &category); + showCount++; + + // Read until empty line (next empty line indicates end of section). + while (index < size && (line = ParseNextLine(buffer, &index, size)) != ""); + } + + VERBOSE(VB_GENERAL,QString("DBOXEPG#%1: EPG parsing done. Got %2 shows for channel %3.").arg(m_cardid).arg(showCount).arg(m_currentEPGRequestChannel)); + EPGFinished(); +} + +QString DBox2EPG::ParseNextLine(QByteArray buffer, int* index, int size) +{ +#ifdef DEBUG_DBOX2EPG_PARSER + VERBOSE(VB_GENERAL,QString("DBOXEPG#%1: Parsing buffer at %2.").arg(m_cardid).arg(*index)); +#endif + QString string; + while (*index < size) + { + char current = buffer[*index]; + *index = *index + 1; + if (current == '\n') + break; + string += current; + } +#ifdef DEBUG_DBOX2EPG_PARSER + VERBOSE(VB_GENERAL,QString("DBOXEPG#%1: Returning %2.").arg(m_cardid).arg(string)); +#endif + return string; +} + +QString DBox2EPG::GetChannelID(const QString& channelnumber) +{ + MSqlQuery query(MSqlQuery::InitCon()); + query.prepare("SELECT chanid " + "FROM channel " + "WHERE " + "channel.channum = :CHANNUM"); + query.bindValue(":CHANNUM", channelnumber); + + if (query.exec() && query.isActive() && query.size() > 0) + { + query.next(); + return query.value(0).toString(); + } + return ""; +} + diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbox2epg.h mythtv-current-dbox2/libs/libmythtv/dbox2epg.h --- mythtv-current/libs/libmythtv/dbox2epg.h 1970-01-01 01:00:00.000000000 +0100 +++ mythtv-current-dbox2/libs/libmythtv/dbox2epg.h 2005-07-29 16:06:15.000000000 +0200 @@ -0,0 +1,60 @@ +/** + * DBox2EPG + * Copyright (c) 2005 by Levent Gündogdu (mythtv@feature-it.com) + * Distributed as part of MythTV under GPL v2 and later. + */ + +#ifndef DBOX2EPG_H_ +#define DBOX2EPG_H_ + +#include "qhttp.h" +#include +#include +#include "mythcontext.h" +#include "tv_rec.h" +#include "dbox2channel.h" + +class DBox2Channel; + +class DBox2EPG : public QObject, public QThread +{ + Q_OBJECT + public: + DBox2EPG(); + ~DBox2EPG(); + void Init(dbox2_options_t* dbox2_options, int cardid, DBox2Channel* channel); + void RequestEPG(const QString& channelNumber); + void ScheduleRequestEPG(const QString& channelNumber); + void Shutdown(); + + public slots: + void httpRequestFinished(int requestID, bool error); + + signals: + void EPGFinished(); + + private: + bool ReadChannels(int cardid); + void UpdateDataBase(QString* chanID, QDateTime* startTime, QDateTime* endTime, QString* title, QString *description, QString *category); + QString DBox2EPG::ParseNextLine(QByteArray buffer, int* index, int size); + QString GetChannelID(const QString& channelnumber) ; + void run(); + + QHttp* http; + dbox2_options_t* m_dbox2options; + DBox2Channel* m_dbox2channel; + int m_cardid; + int m_channelCount; + int m_channelIndex; + map m_channelnumbers; + bool m_isRunning; + bool m_inProgress; + bool m_pendingRequest; + QString m_requestedChannel; + QString m_currentEPGRequestChannel; + int m_currentEPGRequestID; + +}; + + +#endif diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbox2recorder.cpp mythtv-current-dbox2/libs/libmythtv/dbox2recorder.cpp --- mythtv-current/libs/libmythtv/dbox2recorder.cpp 1970-01-01 01:00:00.000000000 +0100 +++ mythtv-current-dbox2/libs/libmythtv/dbox2recorder.cpp 2005-07-29 16:06:15.000000000 +0200 @@ -0,0 +1,667 @@ +/** + * Dbox2Recorder + * Copyright (c) 2005 by Levent Gündogdu (mythtv@feature-it.com) + * Distributed as part of MythTV under GPL v2 and later. + */ + +#include +using namespace std; + +#include +#include "RingBuffer.h" +#include "mythcontext.h" +#include "dbox2recorder.h" +#include +#include +#include +#include +#include +#include + +#define DEBUG_DBOX2_TS +//#define DEBUG_DBOX2_PMT +//#define DEBUG_DBOX2_PID + +int socketConnect(int socket, sockaddr* addr, int len) { + return connect(socket, addr, len); +} + +static const uint32_t crc_table[256] = { + 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, + 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, + 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, + 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, + 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, + 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, + 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, + 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, + 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, + 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, + 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, + 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, + 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, + 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, + 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, + 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, + 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, + 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, + 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, + 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, + 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, + 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, + 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, + 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, + 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, + 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, + 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, + 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, + 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, + 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, + 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, + 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, + 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, + 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, + 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, + 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, + 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, + 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, + 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, + 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, + 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, + 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, + 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 +}; + +unsigned int mpegts_crc32(const uint8_t *data, int len) +{ + register int i; + unsigned int crc = 0xffffffff; + + for (i=0; i> 24) ^ *data++) & 0xff]; + + return crc; +} + +typedef struct ts_packet_{ + uint8_t pid[2]; + uint8_t flags; + uint8_t count; + uint8_t data[184]; + uint8_t adapt_length; + uint8_t adapt_flags; + uint8_t pcr[6]; + uint8_t opcr[6]; + uint8_t splice_count; + uint8_t priv_dat_len; + uint8_t *priv_dat; + uint8_t adapt_ext_len; + uint8_t adapt_eflags; + uint8_t ltw[2]; + uint8_t piece_rate[3]; + uint8_t dts[5]; + int rest; + uint8_t stuffing; +} ts_packet; + +/** + * + * Constructs a DBox2Recorder + * + */ + +DBox2Recorder::DBox2Recorder(DBox2Channel* channel, int cardid) +{ + m_cardid = cardid; + m_channel = channel; + VERBOSE(VB_GENERAL,QString("DBOX#%1: Instantiating recorder.").arg(m_cardid)); + // Initialize DBOX2 connection relevant members + httpPort = -1; + ip = ""; + port = -1; + // Initialize buffers to 1MB + bufferSize = 1024 * 1024; + initStream(&transportStream); + // Status relevant members + isOpen = false; + // Instantiate HTTP + http = new QHttp(); + m_lastPIDRequestID = -1; + m_lastInfoRequestID = -1; + // Initialize members for injecting PAT and PMT + m_pidPAT = 0x00; + m_patPacket = new uint8_t[188]; + m_pidCount = 0; + pat_cc = 0x00; + m_sectionID = -1; + // Inter-object signalling + connect (http, SIGNAL(requestFinished(int,bool)), this, SLOT(httpRequestFinished(int,bool))); + connect (m_channel, SIGNAL(ChannelChanged()), this, SLOT(ChannelChanged())); + connect (m_channel, SIGNAL(ChannelChanging()), this, SLOT(ChannelChanging())); + m_channel->RecorderAlive(true); +} + +DBox2Recorder::~DBox2Recorder() +{ + m_channel->RecorderAlive(false); + // Abort any pending http operation + http->abort(); + http->closeConnection(); + // Disconnect signals + disconnect (m_channel, SIGNAL(ChannelChanging()), this, SLOT(ChannelChanging())); + disconnect (m_channel, SIGNAL(ChannelChanged()), this, SLOT(ChannelChanged())); + disconnect (http, SIGNAL(requestFinished(int,bool)), this, SLOT(httpRequestFinished(int,bool))); + VERBOSE(VB_GENERAL,QString("DBOX#%1: Shutting down recorder.").arg(m_cardid)); + Close(); + VERBOSE(VB_GENERAL,QString("DBOX#%1: Freeing buffers...").arg(m_cardid)); + free(transportStream.buffer); + VERBOSE(VB_GENERAL,QString("DBOX#%1: Done.").arg(m_cardid)); + delete http; +} + +void DBox2Recorder::Close() +{ + if (!isOpen) + return; + + VERBOSE(VB_GENERAL,QString("DBOX#%1: Closing all connections...").arg(m_cardid)); + // Close all sockets + if (transportStream.socket > 0) + close(transportStream.socket); + transportStream.socket = -1; + isOpen = false; +} + + +bool DBox2Recorder::Open() +{ + + if (isOpen) + Close(); + + m_channel->RecorderAlive(true); + return RequestStream(); +} + +bool DBox2Recorder::RequestStream() +{ + VERBOSE(VB_GENERAL,QString("DBOX#%1: Initializing Host: %2, Streaming-Port: %3, Http-Port: %4") + .arg(m_cardid) + .arg(ip) + .arg(port) + .arg(httpPort)); + + // Request PIDs via http. Signal will be emmitted when PIDs are ready. Streaming will be activated afterwards + VERBOSE(VB_GENERAL,QString("DBOX#%1: Retrieving PIDs from %2:%3...").arg(m_cardid).arg(ip).arg(httpPort)); + QHttpRequestHeader header( "GET", "/control/zapto?getallpids" ); + header.setValue("Host", ip); + http->setHost(ip, httpPort); + m_lastPIDRequestID = http->request(header); + return true; +} + +bool DBox2Recorder::RequestInfo() +{ + VERBOSE(VB_GENERAL,QString("DBOX#%1: Requesting stream info on Host: %2, Streaming-Port: %3, Http-Port: %4") + .arg(m_cardid) + .arg(ip) + .arg(port) + .arg(httpPort)); + + // Request Stream info via http. Signal will be emmitted when Info is ready. PIDS will be retrieved afterwards + VERBOSE(VB_GENERAL,QString("DBOX#%1: Retrieving Info from %2:%3...").arg(m_cardid).arg(ip).arg(httpPort)); + QHttpRequestHeader header( "GET", "/control/info?streaminfo" ); + header.setValue("Host", ip); + http->setHost(ip, httpPort); + m_lastInfoRequestID = http->request(header); + return true; +} + +int DBox2Recorder::OpenStream() +{ + QString message = QString("DBOX#%1: Opening pids ").arg(m_cardid); + for (int i = 0; i < m_pidCount; i++) + { + message += QString("%1").arg(m_pids[i]); + message += " (0x" + QString("%1").arg(m_pids[i], 0, 16) + ") "; + } + + VERBOSE(VB_GENERAL,message); + + struct hostent * hp = gethostbyname(ip); + struct sockaddr_in adr; + memset ((char *)&adr, 0, sizeof(struct sockaddr_in)); + + adr.sin_family = AF_INET; + adr.sin_addr.s_addr = ((struct in_addr *)(hp->h_addr))->s_addr; + port = 31339; + + adr.sin_port = htons(port); + + if (adr.sin_addr.s_addr == 0) + { + VERBOSE(VB_GENERAL,QString("DBOX#%1: Error opening TS. Unable to look up hostname.").arg(m_cardid)); + return -1; + } + + // Open socket + int newSocket = socket(AF_INET, SOCK_STREAM, 0); + + if (-1 == socketConnect(newSocket, (sockaddr*)&adr, sizeof(struct sockaddr_in))) + { + perror("connect"); + close(newSocket); + return -1; + } + + // Request TS + QString request = "GET /"; + // Add PIDs + for (int i = 0; i < m_pidCount; i++) { + request += QString("%1").arg(m_pids[i], 0, 16); + if (i+1 < m_pidCount) + request += ","; + } + request += " HTTP/1.0"; + VERBOSE(VB_GENERAL,QString("DBOX#%1: Sending Request '%2'").arg(m_cardid).arg(request)); + request += "\r\n\r\n"; + write(newSocket, request, strlen(request)); + return newSocket; +} + +void DBox2Recorder::StartRecording(void) { + + struct timeval tv; + + VERBOSE(VB_RECORD, QString("StartRecording")); + + if (!Open()) { + VERBOSE(VB_GENERAL,QString("DBOX#%1: Error starting recording. Aborting.").arg(m_cardid)); + _error = true; + return; + } + + _request_recording = true; + _recording = true; + _request_abort = false; + + lastpacket = time(NULL); + long lastShown = time(NULL); + + while(_request_recording) + { + if(_request_abort) + break; + else if(_request_pause) + { + if(!_paused) + _paused = true; + pauseWait.wakeAll(); + usleep(2000); + continue; + } + else if(!_request_pause && _paused) + { + _paused = false; + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Starting input...").arg(m_cardid)); + lastpacket = time(NULL); + } + if (m_lastPIDRequestID >= 0 || m_lastInfoRequestID >= 0) + { + if (time(NULL) - lastShown >= 1) + { + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Waiting for request to finish...").arg(m_cardid)); + lastShown = time(NULL); + lastpacket = time(NULL); + } + usleep(1000); + } + else if(time(NULL) - lastpacket > DBOX2_TIMEOUT) + { + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: No Input in %2 seconds.").arg(m_cardid).arg(DBOX2_TIMEOUT)); + _error = true; + return; + } + + tv.tv_sec = DBOX2_TIMEOUT; + tv.tv_usec = 0; + + // Process transport stream data if open + if (isOpen) + processStream(&transportStream); + else + // Don't process this loop too fast + usleep(1000); + } + + FinishRecording(); + _recording = false; +} + +void DBox2Recorder::SetOptionsFromProfile(RecordingProfile *profile, + const QString &videodev, + const QString &audiodev, + const QString &vbidev, int ispip) +{ + (void)videodev; + (void)audiodev; + (void)vbidev; + (void)profile; + (void)ispip; +} + +void DBox2Recorder::SetOption(const QString &name, const QString &value) +{ + if(name == "ip") { + ip = value; + } + if(name == "host") { + ip = value; + } +} + +void DBox2Recorder::SetOption(const QString &name, int value) +{ + if(name == "port") + port = value; + if(name == "httpport") + httpPort = value; +} + +void DBox2Recorder::httpRequestFinished ( int id, bool error ) +{ + if (error) { + VERBOSE(VB_GENERAL,QString("DBOX#%1: HTTP Request failed!").arg(m_cardid)); + return; + } + + QString buffer=http->readAll(); + + if (id == m_lastPIDRequestID) + { + VERBOSE(VB_GENERAL,QString("DBOX#%1: Retrieving PIDs succeeded. Parsing...").arg(m_cardid)); + m_pidCount = 0; + m_pmtPID = -1; + m_ac3PID = -1; + for (int i = 0; i < 10; i ++) + { + QString pidString = buffer.section("\n", i, i); + if (pidString != "") + { + int pid = pidString.section(" ", 0, 0).toInt(); + if (pid == 0) + { + VERBOSE(VB_GENERAL,QString("DBOX#%1: Warning. Got 0 PID!!!.").arg(m_cardid)); + continue; + } + m_pids[m_pidCount] = pid; + QString pidType = pidString.section(" ", 1).upper(); + if (pidType == "PMT") + { + m_pmtPID = m_pids[m_pidCount]; +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_GENERAL,QString("DBOX#%1: Found PMT with PID %2.").arg(m_cardid).arg(m_pmtPID)); +#endif + } + else + if ((pidType.contains("DOLBY DIGITAL") > 0) || (pidType.contains("AC3") > 0)) + { + m_ac3PID = m_pids[m_pidCount]; +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_GENERAL,QString("DBOX#%1: Found AC3 stream with PID %2.").arg(m_cardid).arg(m_ac3PID)); +#endif + } + m_pidCount++; +#ifdef DEBUG_DBOX2_PID + VERBOSE(VB_GENERAL,QString("DBOX#%1: Found PID %2.").arg(m_cardid).arg(m_pids[i])); +#endif + } + } + + if (m_pidCount == 0) + { + VERBOSE(VB_GENERAL,QString("DBOX#%1: No usable PIDS found. Cannot continue.").arg(m_cardid)); + // Try channel change to last channel + m_channel->SwitchToLastChannel(); + return; + } + + // Open transport stream + transportStream.bufferIndex = 0; + transportStream.socket = OpenStream(); + if (transportStream.socket == -1) + return; + + // Schedule PAT and PMT creation + pkts_until_pat = 0; + m_sectionID = 1; + CreatePAT(m_patPacket); + // Set recorder state to open + isOpen = true; + m_lastPIDRequestID = -1; + return; + } + + if (id == m_lastInfoRequestID) + { + VERBOSE(VB_GENERAL,QString("DBOX#%1: Retrieving info succeeded. Parsing...").arg(m_cardid)); + VERBOSE(VB_GENERAL,QString("DBOX#%1: Got: %2.").arg(m_cardid).arg(buffer)); + m_videoWidth = buffer.section("\n", 0, 0).toInt(); + m_videoHeight = buffer.section("\n", 1, 1).toInt(); + m_videoFormat = buffer.section("\n", 3, 3); + VERBOSE(VB_GENERAL,QString("DBOX#%1: Video is %2x%3 (Format %4).").arg(m_cardid).arg(m_videoWidth).arg(m_videoHeight).arg(m_videoFormat)); + m_lastInfoRequestID = -1; + RequestStream(); + } + +} + +/* + * + */ + +void DBox2Recorder::initStream(stream_meta* stream) { + stream->socket = -1; + stream->buffer = (uint8_t*) malloc(bufferSize); + stream->bufferIndex = 0; +} + +/* + * + */ + +int DBox2Recorder::processStream(stream_meta* stream) +{ + // Read and parse + int bytesRead = read(stream->socket, stream->buffer + stream->bufferIndex, bufferSize - stream->bufferIndex); + if (bytesRead <= 0) { + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Error reading data.").arg(m_cardid)); + return 0; + } + + stream->bufferIndex += bytesRead; + + int readIndex = 0; + while (readIndex < stream->bufferIndex) + { + // Try to find next TS + int tsPos = findTSHeader(stream->buffer + readIndex, stream->bufferIndex); + if (tsPos == -1) + { + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: No TS header.").arg(m_cardid)); + break; + } + + if (tsPos > 0) + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: TS header at %2, not in sync.").arg(m_cardid).arg(tsPos)); + + // Check if enough data is available to process complete TS packet. + if ((stream->bufferIndex - readIndex - tsPos) < 188) { + // VERBOSE(VB_IMPORTANT, QString("DBOX#%1: TS header at %2 but packet not yet complete.").arg(m_cardid).arg(tsPos)); + break; + } + + updatePMTSectionID(stream->buffer+readIndex+tsPos, m_pmtPID); + + // Inject PAT every 2000 TS packets. + if (pkts_until_pat == 0) + { + ringBuffer->Write(m_patPacket, 188); + pkts_until_pat = 2000; + } + else + pkts_until_pat--; + + tpkt.InitHeader(stream->buffer+readIndex+tsPos); + tpkt.InitPayload(stream->buffer+readIndex+tsPos+4); + FindKeyframes(&tpkt); + + ringBuffer->Write(stream->buffer+readIndex+tsPos, 188); + lastpacket = time(NULL); + readIndex += tsPos + 188; + } + + memcpy(stream->buffer, stream->buffer + readIndex, bufferSize - readIndex); + stream->bufferIndex = stream->bufferIndex - readIndex; + + if (stream->bufferIndex < 0) + { + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: WARNING! Buffer index is %2. Resetting.").arg(m_cardid).arg(stream->bufferIndex)); + stream->bufferIndex = 0; + } + + return 0; +} + +void DBox2Recorder::CreatePAT(uint8_t *ts_packet) +{ + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Creating PAT for PMT pid %2.").arg(m_cardid).arg(m_pmtPID)); + + memset(ts_packet, 0xFF, 188); + + ts_packet[0] = 0x47; // sync byte + ts_packet[1] = 0x40 | ((m_pidPAT >> 8) & 0x1F); // payload start & PID + ts_packet[2] = m_pidPAT & 0xFF; // PID + ts_packet[3] = 0x10 | pat_cc; // scrambling, adaptation & continuity counter + ts_packet[4] = 0x00; // pointer field + + ++pat_cc &= 0x0F; // inc. continuity counter + uint8_t *pat = ts_packet + 5; + int p = 0; + + pat[p++] = PAT_TID; // table ID + pat[p++] = 0xB0; // section syntax indicator + p++; // section length (set later) + pat[p++] = 0; // TSID + pat[p++] = 1; // TSID + pat[p++] = 0xC3; // Version + Current/Next + pat[p++] = 0; // Current Section + pat[p++] = 0; // Last Section + pat[p++] = (m_sectionID >> 8) & 0xFF; + pat[p++] = m_sectionID & 0xFF; + pat[p++] = (m_pmtPID >> 8) & 0x1F; + pat[p++] = m_pmtPID & 0xFF; + + pat[2] = p + 4 - 3; // section length + + unsigned int crc = mpegts_crc32(pat, p); + pat[p++] = (crc >> 24) & 0xFF; + pat[p++] = (crc >> 16) & 0xFF; + pat[p++] = (crc >> 8) & 0xFF; + pat[p++] = crc & 0xFF; +} + +void DBox2Recorder::ChannelChanged() +{ + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Channel changed. Requesting streams...").arg(m_cardid)); + Open(); +} + +void DBox2Recorder::ChannelChanging() +{ + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Channel changing. Closing current stream...").arg(m_cardid)); + Close(); +} + +int DBox2Recorder::findTSHeader(uint8_t* buffer, int len) +{ + int pos = 0; + while (pos < len) + { + if (buffer[pos] == 0x47) + return pos; + pos++; + } + return -1; +} + +int DBox2Recorder::getPMTSectionID(uint8_t* buffer, int pmtPID) +{ + int tempPID = ((buffer[1] & 0x1F) << 8) | (buffer[2] & 0xFF); + if (tempPID != pmtPID) + return -1; + +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Found PMT packet with PID %2.").arg(m_cardid).arg(tempPID)); +#endif + return (buffer[8] & 0xFF << 8) | (buffer[9] & 0xFF); +} + +void DBox2Recorder::updatePMTSectionID(uint8_t* buffer, int pmtPID) +{ + int sectionID = getPMTSectionID(buffer, pmtPID); + if (sectionID == -1) + return; + +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Found PMT packet with PID %2 and section id %3. Updating...").arg(m_cardid).arg(pmtPID).arg(sectionID)); +#endif + + uint8_t *pmt = buffer + 5; + // Set service ID to match PAT + pmt[3] = 0; // program number (ServiceID) + pmt[4] = 1; // program number (ServiceID) + if (m_ac3PID != -1) + { +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Looking for AC3 PID in PMT packet...").arg(m_cardid)); +#endif + // AC3 PID is given, change the stream type + uint8_t p = 10; + // Advance by program info length + 2 + p += (((pmt[p] & 0x0F) << 8) | (pmt[p+1] & 0xFF)) + 2; + for (int i = 0; i < m_pidCount; i++) + { + // Step over stream type + p++; + // Get pid + int pid = (pmt[p] & 0x0F) << 8; + pid = pid | (pmt[p+1] & 0xFF); +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Looking for AC3 PID in PMT packet (Pid #%2 == %3)").arg(m_cardid).arg(i).arg(pid)); +#endif + if (pid == m_ac3PID) + { +#ifdef DEBUG_DBOX2_PMT + VERBOSE(VB_IMPORTANT, QString("DBOX#%1: Found AC3 PID in PMT packet. Updating Stream Type...").arg(m_cardid)); +#endif + pmt[p-1] = STREAM_TYPE_AUDIO_AC3; + break; + } + // Advance by pid + p += 2; + // Advance by es info length + 2 + p += ((pmt[p] & 0x0F) << 8) | (pmt[p+1] & 0xFF) + 2; + } + } + int len = pmt[2]; + int crcOffset = len + 3 - 4; + // Recalculate CRC + unsigned long crc = mpegts_crc32(pmt, crcOffset); + pmt[crcOffset] = (crc >> 24) & 0xFF; + pmt[crcOffset+1] = (crc >> 16) & 0xFF; + pmt[crcOffset+2] = (crc >> 8) & 0xFF; + pmt[crcOffset+3] = crc & 0xFF; +} + + diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/dbox2recorder.h mythtv-current-dbox2/libs/libmythtv/dbox2recorder.h --- mythtv-current/libs/libmythtv/dbox2recorder.h 1970-01-01 01:00:00.000000000 +0100 +++ mythtv-current-dbox2/libs/libmythtv/dbox2recorder.h 2005-07-29 16:06:15.000000000 +0200 @@ -0,0 +1,107 @@ +/** + * DBOX2Recorder + * Copyright (c) 2005 by Levent Gündogdu + * Distributed as part of MythTV under GPL v2 and later. + */ + +#ifndef DBOX2RECORDER_H_ +#define DBOX2RECORDER_H_ + +#include "dtvrecorder.h" +#include +#include "dbox2channel.h" +#include "sitypes.h" +#include "qhttp.h" +#include "mpeg/tspacket.h" + +#define DBOX2_TIMEOUT 15 +#define PAT_TID 0x00 +#define PMT_TID 0x02 +#define STREAM_TYPE_VIDEO_MPEG1 0x01 +#define STREAM_TYPE_VIDEO_MPEG2 0x02 +#define STREAM_TYPE_AUDIO_MPEG1 0x03 +#define STREAM_TYPE_AUDIO_MPEG2 0x04 +#define STREAM_TYPE_PRIVATE_SECTION 0x05 +#define STREAM_TYPE_PRIVATE_DATA 0x06 +#define STREAM_TYPE_AUDIO_AAC 0x0f +#define STREAM_TYPE_VIDEO_MPEG4 0x10 +#define STREAM_TYPE_VIDEO_H264 0x1b + +#define STREAM_TYPE_AUDIO_AC3 0x81 +#define STREAM_TYPE_AUDIO_DTS 0x8a + +typedef struct stream_meta_{ + int socket; + uint8_t* buffer; + int bufferIndex; +} stream_meta; + + +class DBox2Recorder : public DTVRecorder +{ + Q_OBJECT + public: + + DBox2Recorder(DBox2Channel *channel, int cardid); + ~DBox2Recorder(); + + void StartRecording(void); + bool Open(void); + void ProcessTSPacket(unsigned char *tspacket, int len); + void SetOptionsFromProfile(RecordingProfile *profile, + const QString &videodev, + const QString &audiodev, + const QString &vbidev, int ispip); + + void SetOption(const QString &name, const QString &value); + void SetOption(const QString &name, int value); + + public slots: + void httpRequestFinished ( int id, bool error ); + void ChannelChanged(); + void ChannelChanging(); + + private: + // Methods + void ChannelChanged(dbox2_channel_t& chan); + void CreatePAT(uint8_t *ts_packet); + int getPMTSectionID(uint8_t* buffer, int pmtPID); + void updatePMTSectionID(uint8_t* buffer, int pmtPID); + int processStream(stream_meta* stream); + void initStream(stream_meta* meta); + int OpenStream(); + bool RequestStream(); + bool RequestInfo(); + int findTSHeader(uint8_t* buffer, int len); + void Close(); + // Members for creating/handling PAT and PMT + int m_cardid; + uint8_t *m_patPacket; + int pat_cc; + int pkts_until_pat; + int m_pidPAT; + int m_pids[10]; + int m_pidCount; + int m_pmtPID; + int m_ac3PID; + int m_sectionID; + DBox2Channel *m_channel; + // Connection relevant members + int port; + int httpPort; + QString ip; + bool isOpen; + QHttp* http; + int m_lastPIDRequestID; + int m_lastInfoRequestID; + time_t lastpacket; + int bufferSize; + stream_meta transportStream; + TSPacket tpkt; + int m_videoWidth; + int m_videoHeight; + QString m_videoFormat; + bool _request_abort; +}; + +#endif diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/libmythtv.pro mythtv-current-dbox2/libs/libmythtv/libmythtv.pro --- mythtv-current/libs/libmythtv/libmythtv.pro 2005-08-02 20:05:18.000000000 +0200 +++ mythtv-current-dbox2/libs/libmythtv/libmythtv.pro 2005-08-02 15:54:32.000000000 +0200 @@ -241,6 +241,10 @@ using_firewire:SOURCES += firewirerecorder.cpp firewirechannel.cpp using_firewire:DEFINES += USING_FIREWIRE + # Support for set top boxes (Nokia DBox2 etc.) + using_dbox2:SOURCES += dbox2recorder.cpp dbox2channel.cpp dbox2epg.cpp + using_dbox2:HEADERS += dbox2recorder.h dbox2channel.h dbox2epg.h + # Support for PVR-150/250/350/500, etc. on Linux using_ivtv:HEADERS += mpegrecorder.h using_ivtv:SOURCES += mpegrecorder.cpp diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/siparser.h mythtv-current-dbox2/libs/libmythtv/siparser.h --- mythtv-current/libs/libmythtv/siparser.h 2005-07-29 16:05:54.000000000 +0200 +++ mythtv-current-dbox2/libs/libmythtv/siparser.h 2005-07-29 16:06:15.000000000 +0200 @@ -75,7 +75,7 @@ * Argentenia has also has announced their Digital TV Standard will be * ATSC over DVB-T * - * Impliemntation of OpenCable or other MPEG-TS based standards (DirecTV?) + * Implementation of OpenCable or other MPEG-TS based standards (DirecTV?) * is also possible with this class if their specs are ever known. * */ diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/tv_rec.cpp mythtv-current-dbox2/libs/libmythtv/tv_rec.cpp --- mythtv-current/libs/libmythtv/tv_rec.cpp 2005-08-02 20:05:19.000000000 +0200 +++ mythtv-current-dbox2/libs/libmythtv/tv_rec.cpp 2005-08-02 15:54:32.000000000 +0200 @@ -53,6 +53,11 @@ #include "firewirechannel.h" #endif +#ifdef USING_DBOX2 +#include "dbox2recorder.h" +#include "dbox2channel.h" +#endif + const int TVRec::kRequestBufferSize = 256*1000; /** \class TVRec @@ -128,7 +133,7 @@ GetDevices(m_capturecardnum, videodev, vbidev, audiodev, audiosamplerate, inputname, startchannel, cardtype, dvb_options, - firewire_options, skip_btaudio); + firewire_options, dbox2_options, skip_btaudio); if (cardtype == "DVB") { @@ -173,6 +178,23 @@ return false; #endif } + else if (cardtype == "DBOX2") + { +#ifdef USING_DBOX2 + channel = new DBox2Channel(this, &dbox2_options, m_capturecardnum); + channel->Open(); + if (inputname.isEmpty()) + channel->SetChannelByString(startchannel); + else + channel->SwitchToInput(inputname, startchannel); +#else + VERBOSE(VB_IMPORTANT, "ERROR: DBOX2 Input configured, " + "but no DBOX2 support compiled in!"); + VERBOSE(VB_IMPORTANT, "Remove the card from configuration, " + "or recompile MythTV."); + exit(-20); +#endif + } else if ((cardtype == "MPEG") && (videodev.lower().left(5) == "file:")) { // No need to initialize channel.. @@ -834,6 +856,23 @@ errored = true; #endif } + else if (cardtype == "DBOX2") + { +#ifdef USING_DBOX2 + VERBOSE(VB_GENERAL,QString("TVRec::SetupRecorder() Initializing DBOX2 on Host: %1, Streaming-Port: %2, Http-Port: %3") + .arg(dbox2_options.host) + .arg(dbox2_options.port) + .arg(dbox2_options.httpport)); + recorder = new DBox2Recorder(dynamic_cast(channel), m_capturecardnum); + recorder->SetRingBuffer(rbuffer); + recorder->SetOptionsFromProfile(&profile, videodev, audiodev, vbidev, ispip); + recorder->SetOption("port", dbox2_options.port); + recorder->SetOption("host", dbox2_options.host); + recorder->SetOption("httpport", dbox2_options.httpport); + recorder->Initialize(); +#endif + return; + } else if (cardtype == "DVB") { #ifdef USING_DVB @@ -1307,7 +1346,7 @@ void TVRec::GetDevices(int cardnum, QString &video, QString &vbi, QString &audio, int &rate, QString &defaultinput, QString &startchan, QString &type, - dvb_options_t &dvb_opts, firewire_options_t &firewire_opts, + dvb_options_t &dvb_opts, firewire_options_t &firewire_opts, dbox2_options_t &dbox2_opts, bool &skip_bt) { video = ""; @@ -1328,7 +1367,7 @@ "dvb_wait_for_seqstart,dvb_dmx_buf_size," "dvb_pkt_buf_size, skipbtaudio, dvb_on_demand," "firewire_port, firewire_node, firewire_speed," - "firewire_model, firewire_connection " + "firewire_model, firewire_connection, dbox2_port, dbox2_host, dbox2_httpport " "FROM capturecard WHERE cardid = :CARDID ;"); query.bindValue(":CARDID", cardnum); @@ -1377,6 +1416,13 @@ if (test != QString::null) firewire_opts.model = QString::fromUtf8(test); firewire_opts.connection = query.value(17).toInt(); + + dbox2_opts.port = query.value(18).toInt(); + dbox2_opts.httpport = query.value(20).toInt(); + test = query.value(19).toString(); + if (test != QString::null) + dbox2_opts.host = QString::fromUtf8(test); + } query.prepare("SELECT if(startchan!='', startchan, '3') " diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/tv_rec.h mythtv-current-dbox2/libs/libmythtv/tv_rec.h --- mythtv-current/libs/libmythtv/tv_rec.h 2005-07-29 16:05:54.000000000 +0200 +++ mythtv-current-dbox2/libs/libmythtv/tv_rec.h 2005-07-29 16:06:15.000000000 +0200 @@ -51,6 +51,13 @@ QString model; } firewire_options_t; +typedef struct _dbox2_options_t +{ + int port; + int httpport; + QString host; +} dbox2_options_t; + class TVRec { public: @@ -188,7 +195,8 @@ void GetDevices(int cardnum, QString &video, QString &vbi, QString &audio, int &rate, QString &defaultinput, QString &startchannel, QString &type, dvb_options_t &dvb_opts, - firewire_options_t &firewire_opts, bool &skip_bt); + firewire_options_t &firewire_opts, dbox2_options_t &dbox2_opts, + bool &skip_bt); void SetupRecorder(class RecordingProfile& profile); void TeardownRecorder(bool killFile = false); @@ -240,11 +248,12 @@ QString liveTVRingBufLoc; QString recprefix; - // Configuration variables from setup rutines + // Configuration variables from setup routines int m_capturecardnum; bool ispip; dvb_options_t dvb_options; firewire_options_t firewire_options; + dbox2_options_t dbox2_options; // State variables QMutex stateChangeLock; diff -Nurb --exclude=CVS --exclude=.svn --exclude=doconfigure.sh --exclude=config.h --exclude=config.log --exclude=config.mak --exclude=Makefile --exclude=mpegts.c --exclude=settings.pro --exclude=mythtv.pro --exclude=mythconfig.h --exclude=mythconfig.mak --exclude=nohup.out --exclude='*.orig' --exclude='*.rej' --exclude='.#*' --exclude='*~' --exclude='moc_*.cpp' --exclude='*.o' --exclude='*.so' --exclude='*.so.*' --exclude='*.a' mythtv-current/libs/libmythtv/videosource.cpp mythtv-current-dbox2/libs/libmythtv/videosource.cpp --- mythtv-current/libs/libmythtv/videosource.cpp 2005-07-29 16:05:53.000000000 +0200 +++ mythtv-current-dbox2/libs/libmythtv/videosource.cpp 2005-07-29 19:30:40.000000000 +0200 @@ -1188,6 +1188,51 @@ CaptureCard& parent; }; +class DBOX2Port: public LineEditSetting, public CCSetting { + public: + DBOX2Port(const CaptureCard& parent): + CCSetting(parent, "dbox2_port") { + setValue("31338"); + setLabel(QObject::tr("DBOX2 Streaming Port")); + setHelpText(QObject::tr("DBOX2 streaming port on your DBOX2.")); + } +}; + +class DBOX2HttpPort: public LineEditSetting, public CCSetting { + public: + DBOX2HttpPort(const CaptureCard& parent): + CCSetting(parent, "dbox2_httpport") { + setValue("80"); + setLabel(QObject::tr("DBOX2 HTTP Port")); + setHelpText(QObject::tr("DBOX2 http port on your DBOX2.")); + } +}; +class DBOX2Host: public LineEditSetting, public CCSetting { + public: + DBOX2Host(const CaptureCard& parent): + CCSetting(parent, "dbox2_host") { + setValue("dbox"); + setLabel(QObject::tr("DBOX2 Host IP")); + setHelpText(QObject::tr("DBOX2 Host IP is the remote device.")); + } +}; + +class DBOX2ConfigurationGroup: public VerticalConfigurationGroup { +public: + DBOX2ConfigurationGroup(CaptureCard& a_parent): + parent(a_parent) { + setUseLabel(false); + addChild(new DBOX2Port(parent)); + addChild(new DBOX2HttpPort(parent)); + addChild(new DBOX2Host(parent)); + }; + private: + CaptureCard& parent; + }; + + + + class V4LConfigurationGroup: public VerticalConfigurationGroup { public: @@ -1273,6 +1318,7 @@ addTarget("HDTV", new pcHDTVConfigurationGroup(parent)); addTarget("MPEG", new MPEGConfigurationGroup(parent)); addTarget("FIREWIRE", new FirewireConfigurationGroup(parent)); + addTarget("DBOX2", new DBOX2ConfigurationGroup(parent)); } void CaptureCardGroup::triggerChanged(const QString& value) @@ -1296,7 +1342,7 @@ { MSqlQuery query(MSqlQuery::InitCon()); query.prepare("SELECT cardtype, videodevice, cardid, " - " firewire_port, firewire_node " + " firewire_port, firewire_node, dbox2_port, dbox2_host, dbox2_httpport " " FROM capturecard WHERE hostname = :HOSTNAME ;"); query.bindValue(":HOSTNAME", gContext->GetHostName()); @@ -1313,6 +1359,13 @@ query.value(4).toString() + "]", query.value(2).toString()); } + else if(query.value(0).toString() == "DBOX2") { + setting->addSelection("[ " + query.value(0).toString() + " " + + "Host IP: " + query.value(6).toString() + ", " + + "Streaming-Port: " + query.value(5).toString() + ", " + + "Http-Port: " + query.value(7).toString() + + "] ", query.value(2).toString()); + } else { setting->addSelection( @@ -1353,6 +1406,7 @@ setting->addSelection(QObject::tr("FireWire Input"), "FIREWIRE"); setting->addSelection(QObject::tr("USB Mpeg-4 Encoder (Plextor ConvertX, etc)"), "GO7007"); + setting->addSelection(QObject::tr("DBOX2 Input"), "DBOX2"); } class CardID: public SelectLabelSetting, public CISetting { @@ -1903,7 +1957,7 @@ MSqlQuery capturecards(MSqlQuery::InitCon()); capturecards.prepare("SELECT cardid, videodevice, cardtype, " - " dvb_diseqc_type, firewire_port, firewire_node " + " dvb_diseqc_type, firewire_port, firewire_node, dbox2_port, dbox2_host, dbox2_httpport " "FROM capturecard " "WHERE hostname = :HOSTNAME"); capturecards.bindValue(":HOSTNAME", gContext->GetHostName()); @@ -1962,6 +2016,29 @@ addSelection(label, index); } } + else if(capturecards.value(2).toString() == "DBOX2") + { + inputs = QStringList("MPEG2TS"); + for (QStringList::iterator i = inputs.begin(); + i != inputs.end(); ++i) + { + CardInput* cardinput = new CardInput(); + cardinput->loadByInput(cardid, *i); + cardinputs.push_back(cardinput); + QString index = QString::number(cardinputs.size()-1); + + QString label; + label = QString("%1 (%2) -> %3") + .arg("[ " + capturecards.value(2).toString() + + "IP: " + capturecards.value(7).toString() + + ", Port: " + capturecards.value(6).toString() + + ", HttpPort: " + capturecards.value(8).toString() + + " ]") + .arg(*i) + .arg(cardinput->getSourceName()); + addSelection(label, index); + } + } else { inputs = VideoDevice::probeInputs(videodevice);