diff -Naur mythtv/libs/libmythtv/tv_play.cpp mythtv-browsepatch/libs/libmythtv/tv_play.cpp --- mythtv/libs/libmythtv/tv_play.cpp 2008-11-12 13:53:54.000000000 +0100 +++ mythtv-browsepatch/libs/libmythtv/tv_play.cpp 2008-11-12 14:10:24.000000000 +0100 @@ -585,6 +585,7 @@ // channel browsing state variables browsemode(false), persistentbrowsemode(false), browsechannum(""), browsechanid(""), browsestarttime(""), + browsealltuners(false), // Program Info for currently playing video recorderPlaybackInfo(NULL), playbackinfo(NULL), playbackLen(0), @@ -673,6 +674,14 @@ ff_rew_speeds.push_back( gContext->GetNumSetting(QString("FFRewSpeed%1").arg(i), def[i])); + browsealltuners = gContext->GetNumSetting("BrowseAllTuners", 0); + if (browsealltuners) + { + QString channelOrdering = gContext->GetSetting("ChannelOrdering", "channum"); + allchannels = ChannelUtil::GetChannels(0, true, "channum, callsign"); + ChannelUtil::SortChannels(allchannels, channelOrdering, true); + }; + vbimode = VBIMode::Parse(gContext->GetSetting("VbiFormat")); QString feVBI = gContext->GetSetting("DecodeVBIFormat", ""); if (!feVBI.isEmpty()) @@ -5645,7 +5654,7 @@ * \param infoMap InfoMap to fill in with returned data */ void TV::GetNextProgram(RemoteEncoder *enc, int direction, - InfoMap &infoMap) + InfoMap &infoMap) const { QString title, subtitle, desc, category, endtime, callsign, iconpath; QDateTime begts, endts; @@ -5799,6 +5808,86 @@ is_tunable_cache_inputs.clear(); } +uint TV::GetChanIDAnyTuner(const QString &chan) const +{ + for (uint i = 0; i < allchannels.size(); ++i) + if (allchannels[i].channum == chan) + return allchannels[i].chanid; + return 0; +} + +QString TV::GetChanNumAnyTuner(const uint &chanid) const +{ + for (uint i = 0; i < allchannels.size(); ++i) + if (allchannels[i].chanid == chanid) + return allchannels[i].channum; + return ""; +} + +void TV::GetNextProgramAnyTuner(int direction, InfoMap &infoMap, + ProgramInfo *prog) const +{ + uint chanid = infoMap["chanid"].toUInt(); + if (!chanid) + chanid = GetChanIDAnyTuner(infoMap["channum"]); + + int chandir = -1; + switch(direction) + { + case BROWSE_UP: chandir = CHANNEL_DIRECTION_UP; break; + case BROWSE_DOWN: chandir = CHANNEL_DIRECTION_DOWN; break; + case BROWSE_FAVORITE: chandir = CHANNEL_DIRECTION_FAVORITE; break; + }; + if (direction != -1) + chanid = ChannelUtil::GetNextChannel(allchannels, chanid, 0, chandir); + + infoMap["chanid"] = QString("%1").arg(chanid); + infoMap["channum"] = GetChanNumAnyTuner(chanid); + + QDateTime nowtime = QDateTime::currentDateTime(); + QDateTime latesttime = nowtime.addSecs(6*60*60); + QDateTime browsetime = QDateTime::fromString(infoMap["dbstarttime"], Qt::ISODate); + + MSqlBindings bindings; + bindings[":CHANID"] = chanid; + bindings[":NOWTS"] = nowtime.toString("yyyy-MM-ddThh:mm:ss"); + bindings[":LATESTTS"] = latesttime.toString("yyyy-MM-ddThh:mm:ss"); + bindings[":BROWSETS"] = browsetime.toString("yyyy-MM-ddThh:mm:ss"); + bindings[":BROWSETS2"] = browsetime.toString("yyyy-MM-ddThh:mm:ss"); + + QString querystr = " WHERE program.chanid = :CHANID "; + switch(direction) + { + case BROWSE_LEFT: + querystr += " AND program.endtime <= :BROWSETS " + " AND program.endtime > :NOWTS "; + break; + + case BROWSE_RIGHT: + querystr += " AND program.starttime > :BROWSETS " + " AND program.starttime < :LATESTTS "; + break; + + default: + querystr += " AND program.starttime <= :BROWSETS " + " AND program.endtime > :BROWSETS2 "; + }; + + ProgramList progList; + progList.FromProgram(querystr, bindings); + + if (progList.isEmpty()) + { + infoMap["dbstarttime"] = ""; + return; + }; + + prog = (direction == BROWSE_LEFT) ? progList.take(progList.count() - 1) + : progList.take(0); + + infoMap["dbstarttime"] = prog->startts.toString(Qt::ISODate); +} + void TV::EmbedOutput(WId wid, int x, int y, int w, int h) { embedWinID = wid; @@ -6645,7 +6734,11 @@ infoMap["channum"] = browsechannum; infoMap["chanid"] = browsechanid; - GetNextProgram(activerecorder, direction, infoMap); + ProgramInfo *program_info = NULL; + if (browsealltuners) + GetNextProgramAnyTuner(direction, infoMap, program_info); + else + GetNextProgram(activerecorder, direction, infoMap); browsechannum = infoMap["channum"]; browsechanid = infoMap["chanid"]; @@ -6656,13 +6749,19 @@ browsestarttime = infoMap["dbstarttime"]; } - QDateTime startts = QDateTime::fromString(browsestarttime, Qt::ISODate); - ProgramInfo *program_info = - ProgramInfo::GetProgramAtDateTime(browsechanid, startts); + if (!program_info) + { + QDateTime startts = QDateTime::fromString(browsestarttime, Qt::ISODate); + program_info = + ProgramInfo::GetProgramAtDateTime(browsechanid, startts); + } if (program_info) program_info->ToMap(infoMap); + if (browsealltuners && !IsTunable(browsechanid.toUInt())) + infoMap["channum"] = "x" + infoMap["channum"]; + GetOSD()->ClearAllText("browse_info"); GetOSD()->SetText("browse_info", infoMap, -1); @@ -6760,7 +6859,12 @@ void TV::BrowseChannel(const QString &chan) { - if (!activerecorder->CheckChannel(chan)) + if (browsealltuners) + { + if (!GetChanIDAnyTuner(chan)) + return; + } + else if (!activerecorder->CheckChannel(chan)) return; browsechannum = chan; diff -Naur mythtv/libs/libmythtv/tv_play.h mythtv-browsepatch/libs/libmythtv/tv_play.h --- mythtv/libs/libmythtv/tv_play.h 2008-11-12 13:53:54.000000000 +0100 +++ mythtv-browsepatch/libs/libmythtv/tv_play.h 2008-11-12 13:55:12.000000000 +0100 @@ -226,7 +226,7 @@ void SetCurrentlyPlaying(ProgramInfo *pginfo); void GetNextProgram(RemoteEncoder *enc, int direction, - InfoMap &infoMap); + InfoMap &infoMap) const; // static functions static void InitKeys(void); @@ -406,6 +406,11 @@ void ToggleRecord(void); void BrowseChannel(const QString &channum); + uint GetChanIDAnyTuner(const QString &chan) const; + QString GetChanNumAnyTuner(const uint &chanid) const; + void GetNextProgramAnyTuner(int direction, InfoMap &infoMap, + ProgramInfo *prog) const; + void DoTogglePictureAttribute(PictureAdjustType type); void DoChangePictureAttribute( PictureAdjustType type, PictureAttribute attr, bool up); @@ -600,6 +605,8 @@ QString browsechannum; QString browsechanid; QString browsestarttime; + bool browsealltuners; + DBChanList allchannels; // Program Info for currently playing video // (or next video if InChangeState() is true) diff -Naur mythtv/programs/mythfrontend/globalsettings.cpp mythtv-browsepatch/programs/mythfrontend/globalsettings.cpp --- mythtv/programs/mythfrontend/globalsettings.cpp 2008-11-12 13:54:12.000000000 +0100 +++ mythtv-browsepatch/programs/mythfrontend/globalsettings.cpp 2008-11-12 13:55:12.000000000 +0100 @@ -1981,6 +1981,18 @@ return gc; } +static HostCheckBox *BrowseAllTuners() +{ + HostCheckBox *gc = new HostCheckBox("BrowseAllTuners"); + gc->setLabel(QObject::tr("Browse channels from all tuners")); + gc->setValue(true); + gc->setHelpText(QObject::tr("By default, browse mode only shows channels " + "on the currently active tuner. If enabled, browse mode " + "will shows all channels, no matter what tuner they " + "exist on.")); + return gc; +} + static HostCheckBox *AggressiveBuffer() { HostCheckBox *gc = new HostCheckBox("AggressiveSoundcardBuffer"); @@ -4795,6 +4807,7 @@ osd->addChild(OSDThemeFontSizeType()); osd->addChild(EnableMHEG()); osd->addChild(PersistentBrowseMode()); + osd->addChild(BrowseAllTuners()); addChild(osd); VerticalConfigurationGroup *udp = new VerticalConfigurationGroup(false);