Index: libs/libmythtv/videoout_vdpau.h =================================================================== --- libs/libmythtv/videoout_vdpau.h (revision 23571) +++ libs/libmythtv/videoout_vdpau.h (working copy) @@ -16,7 +16,7 @@ { public: static void GetRenderOptions(render_opts &opts); - VideoOutputVDPAU(MythCodecID codec_id); + VideoOutputVDPAU(PlaySettings *settings, MythCodecID codec_id); ~VideoOutputVDPAU(); bool Init(int width, int height, float aspect, WId winid, int winx, int winy, int winw, int winh, WId embedid = 0); @@ -49,7 +49,8 @@ const QSize &video_dim); static MythCodecID GetBestSupportedCodec(uint width, uint height, uint stream_type, - bool no_acceleration); + bool no_acceleration, + PlaySettings *settings); DisplayInfo GetDisplayInfo(void); virtual bool IsPIPSupported(void) const { return true; } virtual bool IsPBPSupported(void) const { return false; } Index: libs/libmythtv/NuppelVideoPlayer.cpp =================================================================== --- libs/libmythtv/NuppelVideoPlayer.cpp (revision 23571) +++ libs/libmythtv/NuppelVideoPlayer.cpp (working copy) @@ -59,6 +59,7 @@ #include "util-osx-cocoa.h" #include "mythverbose.h" #include "myth_imgconvert.h" +#include "playsettings.h" extern "C" { #include "vbitext/vbi.h" @@ -231,16 +232,6 @@ // Playback (output) zoom control detect_letter_box = new DetectLetterbox(this); - vbimode = VBIMode::Parse(gContext->GetSetting("VbiFormat")); - - commrewindamount = gContext->GetNumSetting("CommRewindAmount",0); - commnotifyamount = gContext->GetNumSetting("CommNotifyAmount",0); - decode_extra_audio=gContext->GetNumSetting("DecodeExtraAudio", 0); - itvEnabled = gContext->GetNumSetting("EnableMHEG", 0); - db_prefer708 = gContext->GetNumSetting("Prefer708Captions", 1); - autocommercialskip = (CommSkipMode) - gContext->GetNumSetting("AutoCommercialSkip", kCommSkipOff); - lastIgnoredManualSkip = QDateTime::currentDateTime().addSecs(-10); bzero(&txtbuffers, sizeof(txtbuffers)); @@ -666,7 +657,7 @@ if (using_null_videoout) { - videoOutput = new VideoOutputNull(); + videoOutput = new VideoOutputNull(GetPlaySettings()); if (!videoOutput->Init(video_disp_dim.width(), video_disp_dim.height(), video_aspect, 0, 0, 0, 0, 0, 0)) { @@ -715,7 +706,7 @@ pipState, video_disp_dim, video_aspect, widget->winId(), display_rect, (video_frame_rate * play_speed), - 0 /*embedid*/); + 0 /*embedid*/, GetPlaySettings()); if (!videoOutput) { @@ -737,7 +728,7 @@ videoOutput->EmbedInWidget(embx, emby, embw, embh); } - SetCaptionsEnabled(gContext->GetNumSetting("DefaultCCMode"), false); + SetCaptionsEnabled(GetPlaySettings()->GetNumSetting("DefaultCCMode", 0), false); InitFilters(); @@ -788,7 +779,7 @@ void NuppelVideoPlayer::ReinitVideo(void) { - if (!videoOutput->IsPreferredRenderer(video_disp_dim)) + if (!videoOutput->IsPreferredRenderer(video_disp_dim, GetPlaySettings())) { VERBOSE(VB_PLAYBACK, LOC + QString("Need to switch video renderer.")); SetErrored(QObject::tr("Need to switch video renderer.")); @@ -2920,7 +2911,7 @@ refreshrate = 0; lastsync = false; - usevideotimebase = gContext->GetNumSetting("UseVideoTimebase", 0); + usevideotimebase = GetPlaySettings()->GetNumSetting("UseVideoTimebase", 0); if (VERBOSE_LEVEL_CHECK(VB_PLAYBACK)) output_jmeter = new Jitterometer("video_output", 100); @@ -2959,7 +2950,7 @@ m_double_process = videoOutput->IsExtraProcessingRequired(); videosync = VideoSync::BestMethod( - videoOutput, fr_int, rf_int, m_double_framerate); + videoOutput, GetPlaySettings(), fr_int, rf_int, m_double_framerate); // Make sure video sync can do it if (videosync != NULL && m_double_framerate) @@ -3448,7 +3439,7 @@ osd->SetListener(m_tv); videoOutput->GetOSDBounds(total, visible, aspect, scaling, osd->GetThemeAspect()); - osd->Init(total, frame_interval, visible, aspect, scaling); + osd->Init(GetPlaySettings(), total, frame_interval, visible, aspect, scaling); videoOutput->InitOSD(osd); @@ -3522,7 +3513,7 @@ GetDecoder()->setExactSeeks(seeks); - if (gContext->GetNumSetting("ClearSavedPosition", 1) && + if (GetPlaySettings()->GetNumSetting("ClearSavedPosition", 1) && !player_ctx->IsPIP()) { if (player_ctx->buffer->isDVD()) @@ -3790,7 +3781,7 @@ ++deleteIter; if (deleteIter.key() == totalFrames) { - if (!(gContext->GetNumSetting("EndOfRecordingExitPrompt") == 1 + if (!(GetPlaySettings()->GetNumSetting("EndOfRecordingExitPrompt", 0) == 1 && !player_ctx->IsPIP() && player_ctx->GetState() == kState_WatchingPreRecorded)) { @@ -3964,7 +3955,7 @@ if (sim_pip_players.isEmpty()) { - return (PIPLocation)gContext->GetNumSetting("PIPLocation", kPIPTopLeft); + return (PIPLocation)GetPlaySettings()->GetNumSetting("PIPLocation", kPIPTopLeft); } // order of preference, could be stored in db if we want it configurable @@ -4821,6 +4812,8 @@ exactseeks = frame_exact_seek; player_ctx = ctx; livetv = ctx->tvchain; + + vbimode = VBIMode::Parse(GetPlaySettings()->GetSetting("VbiFormat", "")); } void NuppelVideoPlayer::SetDeleteIter(void) @@ -7483,7 +7476,8 @@ { QMutexLocker locker(&subtitleLock); textSubtitles.Clear(); - return TextSubtitleParser::LoadSubtitles(subtitleFileName, textSubtitles); + return TextSubtitleParser::LoadSubtitles(subtitleFileName, textSubtitles, + GetPlaySettings()); } void NuppelVideoPlayer::ChangeDVDTrack(bool ffw) Index: libs/libmythtv/videooutwindow.cpp =================================================================== --- libs/libmythtv/videooutwindow.cpp (revision 23571) +++ libs/libmythtv/videooutwindow.cpp (working copy) @@ -30,6 +30,7 @@ #include "videooutwindow.h" #include "osd.h" #include "osdsurface.h" +#include "playsettings.h" #include "NuppelVideoPlayer.h" #include "videodisplayprofile.h" #include "decoderbase.h" @@ -54,7 +55,7 @@ const float VideoOutWindow::kManualZoomMinVerticalZoom = 0.5f; const int VideoOutWindow::kManualZoomMaxMove = 50; -VideoOutWindow::VideoOutWindow() : +VideoOutWindow::VideoOutWindow(PlaySettings *_settings) : // DB settings db_move(0, 0), db_scale_horiz(0.0f), db_scale_vert(0.0f), db_pip_size(26), @@ -85,12 +86,14 @@ // Various state variables embedding(false), needrepaint(false), - allowpreviewepg(true), pip_state(kPIPOff) + allowpreviewepg(true), pip_state(kPIPOff), + + settings(_settings) { db_pip_size = gContext->GetNumSetting("PIPSize", 26); - db_move = QPoint(gContext->GetNumSetting("xScanDisplacement", 0), - gContext->GetNumSetting("yScanDisplacement", 0)); + db_move = QPoint(settings->GetNumSetting("xScanDisplacement", 0), + settings->GetNumSetting("yScanDisplacement", 0)); db_use_gui_size = gContext->GetNumSetting("GuiSizeForTV", 0); QDesktopWidget *desktop = NULL; @@ -613,9 +616,9 @@ if (change) { db_scale_vert = - gContext->GetNumSetting("VertScanPercentage", 0) * 0.01f; + settings->GetNumSetting("VertScanPercentage", 0) * 0.01f; db_scale_horiz = - gContext->GetNumSetting("HorizScanPercentage", 0) * 0.01f; + settings->GetNumSetting("HorizScanPercentage", 0) * 0.01f; db_scaling_allowed = true; } else Index: libs/libmythtv/videoout_d3d.cpp =================================================================== --- libs/libmythtv/videoout_d3d.cpp (revision 23571) +++ libs/libmythtv/videoout_d3d.cpp (working copy) @@ -948,8 +948,8 @@ opts.priorities->insert("direct3d", 55); } -VideoOutputD3D::VideoOutputD3D(void) - : VideoOutput(), m_lock(QMutex::Recursive), +VideoOutputD3D::VideoOutputD3D(PlaySettings *settings) + : VideoOutput(settings), m_lock(QMutex::Recursive), m_hWnd(NULL), m_ctx(NULL), m_video(NULL), m_osd(NULL), m_d3d_osd(false), m_osd_ready(false), Index: libs/libmythtv/videoout_opengl.cpp =================================================================== --- libs/libmythtv/videoout_opengl.cpp (revision 23571) +++ libs/libmythtv/videoout_opengl.cpp (working copy) @@ -38,8 +38,8 @@ opts.priorities->insert("opengl", 65); } -VideoOutputOpenGL::VideoOutputOpenGL(void) - : VideoOutput(), +VideoOutputOpenGL::VideoOutputOpenGL(PlaySettings *settings) + : VideoOutput(settings), gl_context_lock(QMutex::Recursive), gl_context(NULL), gl_videochain(NULL), gl_osdchain(NULL), gl_pipchain_active(NULL), Index: libs/libmythtv/videoout_quartz.cpp =================================================================== --- libs/libmythtv/videoout_quartz.cpp (revision 23571) +++ libs/libmythtv/videoout_quartz.cpp (working copy) @@ -65,6 +65,8 @@ #include "videodisplayprofile.h" #include "videoout_dvdv.h" +class PlaySettings; + #define LOC QString("VideoOutputQuartz::") #define LOC_ERR QString("VideoOutputQuartz Error: ") @@ -1108,9 +1110,9 @@ /** \class VideoOutputQuartz * \brief Implementation of Quartz (Mac OS X windowing system) video output */ -VideoOutputQuartz::VideoOutputQuartz( +VideoOutputQuartz::VideoOutputQuartz(PlaySettings *settings MythCodecID _myth_codec_id, void *codec_priv) : - VideoOutput(), Started(false), data(new QuartzData()), + VideoOutput(settings), Started(false), data(new QuartzData()), myth_codec_id(_myth_codec_id) { init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0); @@ -1815,12 +1817,12 @@ MythCodecID VideoOutputQuartz::GetBestSupportedCodec( uint width, uint height, uint osd_width, uint osd_height, - uint stream_type, uint fourcc) + uint stream_type, uint fourcc, PlaySettings *settings) { (void) osd_width; (void) osd_height; - VideoDisplayProfile vdp; + VideoDisplayProfile vdp(settings); vdp.SetInput(QSize(width, height)); QString dec = vdp.GetDecoder(); if ((dec == "libmpeg2") || (dec == "ffmpeg")) Index: libs/libmythtv/avformatdecoder.cpp =================================================================== --- libs/libmythtv/avformatdecoder.cpp (revision 23571) +++ libs/libmythtv/avformatdecoder.cpp (working copy) @@ -28,6 +28,7 @@ #include "videodisplayprofile.h" #include "mythuihelper.h" #include "myth_imgconvert.h" +#include "playsettings.h" #include "lcddevice.h" @@ -498,7 +499,7 @@ allow_ac3_passthru(false), allow_dts_passthru(false), internal_vol(false), disable_passthru(false), max_channels(2), - last_ac3_channels(0), dummy_frame(NULL), + last_ac3_channels(0), dummy_frame(NULL), // DVD lastdvdtitle(-1), decodeStillFrame(false), @@ -526,7 +527,7 @@ cc608_build_parity_table(cc608_parity_table); - if (gContext->GetNumSetting("CCBackground", 0)) + if (GetNVP()->GetPlaySettings()->GetNumSetting("CCBackground", 0)) CC708Window::forceWhiteOnBlackText = true; no_dts_hack = false; @@ -1377,7 +1378,7 @@ codec = find_vdpau_decoder(codec, enc->codec_id); if (selectedStream && - !gContext->GetNumSetting("DecodeExtraAudio", 0) && + !GetNVP()->GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0) && !CODEC_IS_HWACCEL(codec)) { SetLowBuffers(false); @@ -1812,7 +1813,7 @@ if (!is_db_ignored) { - VideoDisplayProfile vdp; + VideoDisplayProfile vdp(GetNVP()->GetPlaySettings()); vdp.SetInput(QSize(width, height)); dec = vdp.GetDecoder(); thread_count = vdp.GetMaxCPUs(); @@ -1835,7 +1836,8 @@ MythCodecID vdpau_mcid; vdpau_mcid = VideoOutputVDPAU::GetBestSupportedCodec( width, height, - mpeg_version(enc->codec_id), no_hardware_decoders); + mpeg_version(enc->codec_id), no_hardware_decoders, + GetNVP()->GetPlaySettings()); if (vdpau_mcid >= video_codec_id) { @@ -1867,7 +1869,8 @@ /* mpeg type */ mpeg_version(enc->codec_id), /* xvmc pix fmt */ xvmc_pixel_format(enc->pix_fmt), /* test surface */ codec_is_std(video_codec_id), - /* force_xv */ force_xv); + /* force_xv */ force_xv, + GetNVP()->GetPlaySettings()); if (mcid >= video_codec_id) { @@ -1900,7 +1903,8 @@ /* osd dim */ 0, 0, /* mpeg type */ mpeg_version(enc->codec_id), /* pixel format */ - (PIX_FMT_YUV420P == enc->pix_fmt) ? FOURCC_I420 : 0); + (PIX_FMT_YUV420P == enc->pix_fmt) ? FOURCC_I420 : 0, + GetNVP()->GetPlaySettings()); if (quartz_mcid >= video_codec_id) { Index: libs/libmythtv/osdtypes.cpp =================================================================== --- libs/libmythtv/osdtypes.cpp (revision 23571) +++ libs/libmythtv/osdtypes.cpp (working copy) @@ -18,6 +18,7 @@ #include "mythcontext.h" #include "mythdialogs.h" #include "mythverbose.h" +#include "playsettings.h" #ifdef USING_FRIBIDI #include "fribidi/fribidi.h" @@ -2359,7 +2360,8 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ OSDTypeCC::OSDTypeCC(const QString &name, TTFFont *font, int xoff, int yoff, - int dispw, int disph, float wmult, float hmult) + int dispw, int disph, float wmult, float hmult, + PlaySettings *settings) : OSDType(name) { m_font = font; @@ -2373,7 +2375,7 @@ QRect rect = QRect(0, 0, 0, 0); m_box = new OSDTypeBox("cc_background", rect, wmult, hmult); - m_ccbackground = gContext->GetNumSetting("CCBackground", 0); + m_ccbackground = settings->GetNumSetting("CCBackground", 0); } OSDTypeCC::~OSDTypeCC() @@ -2603,7 +2605,7 @@ } OSDType708CC::OSDType708CC(const QString &name, TTFFont *fonts[48], - int xoff, int yoff, int dispw, int disph) : + int xoff, int yoff, int dispw, int disph) : OSDType(name) { xoffset = xoff; Index: libs/libmythtv/playgroup.cpp =================================================================== --- libs/libmythtv/playgroup.cpp (revision 23571) +++ libs/libmythtv/playgroup.cpp (working copy) @@ -2,6 +2,7 @@ #include "mythdb.h" #include "playgroup.h" #include "programinfo.h" +#include "playsettings.h" // A parameter associated with the profile itself class PlayGroupDBStorage : public SimpleDBStorage @@ -211,8 +212,9 @@ return res; } -PlayGroupEditor::PlayGroupEditor(void) : - listbox(new ListBoxSetting(this)), lastValue("Default") +PlayGroupEditor::PlayGroupEditor(SettingsLookup pbfunc, SettingsLookup osdfunc) : + listbox(new ListBoxSetting(this)), lastValue("Default"), + getPbSettings(pbfunc), getOsdSettings(osdfunc) { listbox->setLabel(tr("Playback Groups")); addChild(listbox); @@ -243,6 +245,14 @@ } PlayGroup group(name); + if (getPbSettings || getOsdSettings) + { + PlaySettings *psettings = new PlaySettings(name); + if (getPbSettings) + getPbSettings(psettings, &group); + if (getOsdSettings) + getOsdSettings(psettings, &group); + } if (group.exec() == QDialog::Accepted || !created) lastValue = name; else @@ -277,6 +287,7 @@ query.bindValue(":NAME", name); if (!query.exec()) MythDB::DBError("PlayGroupEditor::doDelete", query); + PlaySettings::deleteGroup(name); int lastIndex = listbox->getValueIndex(name); lastValue = ""; Index: libs/libmythtv/libmythtv.pro =================================================================== --- libs/libmythtv/libmythtv.pro (revision 23571) +++ libs/libmythtv/libmythtv.pro (working copy) @@ -179,6 +179,9 @@ SOURCES += iso639.cpp SOURCES += mythsystemevent.cpp +HEADERS += playsettings.h +SOURCES += playsettings.cpp + # DiSEqC HEADERS += diseqc.h diseqcsettings.h SOURCES += diseqc.cpp diseqcsettings.cpp Index: libs/libmythtv/videoout_opengl.h =================================================================== --- libs/libmythtv/videoout_opengl.h (revision 23571) +++ libs/libmythtv/videoout_opengl.h (working copy) @@ -10,7 +10,7 @@ { public: static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); - VideoOutputOpenGL(); + VideoOutputOpenGL(PlaySettings *settings); ~VideoOutputOpenGL(); bool Init(int width, int height, float aspect, WId winid, Index: libs/libmythtv/osdtypes.h =================================================================== --- libs/libmythtv/osdtypes.h (revision 23571) +++ libs/libmythtv/osdtypes.h (working copy) @@ -31,6 +31,7 @@ class OSDTypeText; class OSDSurface; class TV; +class PlaySettings; typedef QHash InfoMap; typedef QMap HotKeyMap; @@ -573,7 +574,8 @@ { public: OSDTypeCC(const QString &name, TTFFont *font, int xoff, int yoff, - int dispw, int disph, float wmult, float hmult); + int dispw, int disph, float wmult, float hmult, + PlaySettings *settings); ~OSDTypeCC(); void Reinit(float wmult, float hmult); Index: libs/libmythtv/tv_play.h =================================================================== --- libs/libmythtv/tv_play.h (revision 23571) +++ libs/libmythtv/tv_play.h (working copy) @@ -56,6 +56,7 @@ class TV; class OSDListTreeItemEnteredEvent; class OSDListTreeItemSelectedEvent; +class PlaySettings; typedef QMap DDValueMap; typedef QMap DDKeyMap; @@ -179,7 +180,7 @@ unsigned long seconds; }; - TV(void); + TV(PlaySettings *settings); ~TV(); bool Init(bool createWindow = true); @@ -204,7 +205,7 @@ // Recording commands int PlayFromRecorder(int recordernum); - int Playback(const ProgramInfo &rcinfo); + int Playback(const ProgramInfo &rcinfo, PlaySettings *settings); // Commands used by frontend playback box QString GetRecordingGroup(int player_idx) const; @@ -593,7 +594,7 @@ static TVState RemoveRecording(TVState state); void RestoreScreenSaver(const PlayerContext*); - void InitUDPNotifyEvent(void); + void InitUDPNotifyEvent(PlaySettings *settings); /// true if dialog is either videoplayexit, playexit or askdelete dialog bool IsVideoExitDialog(const QString &dialog_name); Index: libs/libmythtv/playgroup.h =================================================================== --- libs/libmythtv/playgroup.h (revision 23571) +++ libs/libmythtv/playgroup.h (working copy) @@ -7,6 +7,7 @@ #include "mythwidgets.h" class ProgramInfo; +class PlaySettings; class MPUBLIC PlayGroup: public ConfigurationWizard { @@ -29,7 +30,9 @@ Q_OBJECT public: - PlayGroupEditor(void); + typedef ConfigurationWizard *(*SettingsLookup)(PlaySettings *settings, + ConfigurationWizard *base); + PlayGroupEditor(SettingsLookup pbfunc=0, SettingsLookup osdfunc=0); virtual DialogCode exec(void); virtual void Load(void); virtual void Save(void) { } @@ -44,6 +47,8 @@ protected: ListBoxSetting *listbox; QString lastValue; + SettingsLookup getPbSettings; + SettingsLookup getOsdSettings; }; #endif Index: libs/libmythtv/dbcheck.cpp =================================================================== --- libs/libmythtv/dbcheck.cpp (revision 23571) +++ libs/libmythtv/dbcheck.cpp (working copy) @@ -3569,7 +3569,7 @@ VideoDisplayProfile::CreateNewProfiles(host); profiles = VideoDisplayProfile::GetProfiles(host); - QString profile = VideoDisplayProfile::GetDefaultProfileName(host); + QString profile = VideoDisplayProfile::GetDefaultProfileName(host, NULL); if (profiles.contains("Normal") && (profile=="CPU++" || profile=="CPU+" || profile=="CPU--")) @@ -5637,6 +5637,13 @@ " jump int(11) NOT NULL default '0'," " PRIMARY KEY (`name`)" ");", +"CREATE TABLE playgroupsettings (" +" playgroupname varchar(64) NOT NULL," +" `value` varchar(128) NOT NULL," +" `data` text," +" overridden tinyint(1) NOT NULL," +" PRIMARY KEY (playgroupname, `value`)" +");", "CREATE TABLE powerpriority (" " priorityname varchar(64) collate utf8_bin NOT NULL," " recpriority int(10) NOT NULL default '0'," Index: libs/libmythtv/videoout_vdpau.cpp =================================================================== --- libs/libmythtv/videoout_vdpau.cpp (revision 23571) +++ libs/libmythtv/videoout_vdpau.cpp (working copy) @@ -46,8 +46,8 @@ opts.deints->insert("vdpau", deints); } -VideoOutputVDPAU::VideoOutputVDPAU(MythCodecID codec_id) - : VideoOutput(), +VideoOutputVDPAU::VideoOutputVDPAU(PlaySettings *settings, MythCodecID codec_id) + : VideoOutput(settings), m_codec_id(codec_id), m_win(0), m_render(NULL), m_buffer_size(NUM_VDPAU_BUFFERS), m_pause_surface(0), m_need_deintrefs(false), m_video_mixer(0), m_mixer_features(kVDPFeatNone), @@ -857,10 +857,10 @@ MythCodecID VideoOutputVDPAU::GetBestSupportedCodec( uint width, uint height, - uint stream_type, bool no_acceleration) + uint stream_type, bool no_acceleration, PlaySettings *settings) { bool use_cpu = no_acceleration; - VideoDisplayProfile vdp; + VideoDisplayProfile vdp(settings); vdp.SetInput(QSize(width, height)); QString dec = vdp.GetDecoder(); Index: libs/libmythtv/videoout_directfb.cpp =================================================================== --- libs/libmythtv/videoout_directfb.cpp (revision 23571) +++ libs/libmythtv/videoout_directfb.cpp (working copy) @@ -274,8 +274,8 @@ opts.priorities->insert("directfb", 60); } -VideoOutputDirectfb::VideoOutputDirectfb(void) - : VideoOutput(), XJ_started(false), widget(NULL), +VideoOutputDirectfb::VideoOutputDirectfb(PlaySettings *settings) + : VideoOutput(settings), XJ_started(false), widget(NULL), data(new DirectfbData()) { init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0); Index: libs/libmythtv/videoout_d3d.h =================================================================== --- libs/libmythtv/videoout_d3d.h (revision 23571) +++ libs/libmythtv/videoout_d3d.h (working copy) @@ -93,7 +93,7 @@ { public: static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); - VideoOutputD3D(); + VideoOutputD3D(PlaySettings *settings); ~VideoOutputD3D(); bool Init(int width, int height, float aspect, WId winid, Index: libs/libmythtv/playercontext.cpp =================================================================== --- libs/libmythtv/playercontext.cpp (revision 23571) +++ libs/libmythtv/playercontext.cpp (working copy) @@ -14,6 +14,7 @@ #include "videoouttypes.h" #include "storagegroup.h" #include "mythcontext.h" +#include "playsettings.h" #define LOC QString("playCtx: ") #define LOC_ERR QString("playCtx, Error: ") @@ -435,7 +436,7 @@ WId embedwinid, const QRect *embedbounds, bool muted) { - int exact_seeking = gContext->GetNumSetting("ExactSeeking", 0); + int exact_seeking = settings->GetNumSetting("ExactSeeking", 0); if (HasNVP()) { @@ -450,6 +451,11 @@ _nvp->DisableHardwareDecoders(); _nvp->SetPlayerInfo(tv, widget, exact_seeking, this); + _nvp->commrewindamount = settings->GetNumSetting("CommRewindAmount", 0); + _nvp->commnotifyamount = settings->GetNumSetting("CommNotifyAmount", 0); + _nvp->decode_extra_audio = settings->GetNumSetting("DecodeExtraAudio", 0); + _nvp->itvEnabled = settings->GetNumSetting("EnableMHEG", 0); + _nvp->db_prefer708 = settings->GetNumSetting("Prefer708Captions", 1); _nvp->SetAudioInfo(gContext->GetSetting("AudioOutputDevice"), gContext->GetSetting("PassThruOutputDevice"), gContext->GetNumSetting("AudioSampleRate", 44100)); @@ -888,7 +894,7 @@ /** * \brief assign programinfo to the context */ -void PlayerContext::SetPlayingInfo(const ProgramInfo *info) +void PlayerContext::SetPlayingInfo(const ProgramInfo *info, PlaySettings *_settings) { bool ignoreDB = gContext->IsDatabaseIgnored(); @@ -900,6 +906,7 @@ playingInfo->MarkAsInUse(false); delete playingInfo; playingInfo = NULL; + // XXX delete settings? } if (info) @@ -908,6 +915,7 @@ if (!ignoreDB) playingInfo->MarkAsInUse(true, recUsage); playingLen = playingInfo->CalculateLength(); + settings = (_settings ? _settings : new PlaySettings(playingInfo->playgroup)); } } Index: libs/libmythtv/NuppelVideoPlayer.h =================================================================== --- libs/libmythtv/NuppelVideoPlayer.h (revision 23571) +++ libs/libmythtv/NuppelVideoPlayer.h (working copy) @@ -196,6 +196,10 @@ bool GetAudioBufferStatus(uint &fill, uint &total) const; PIPLocation GetNextPIPLocation(void) const; + PlaySettings *GetPlaySettings(void) const { + return player_ctx ? player_ctx->settings : NULL; + } + // Bool Gets bool GetRawAudioState(void) const; bool GetLimitKeyRepeat(void) const { return limitKeyRepeat; } Index: libs/libmythtv/textsubtitleparser.h =================================================================== --- libs/libmythtv/textsubtitleparser.h (revision 23571) +++ libs/libmythtv/textsubtitleparser.h (working copy) @@ -17,6 +17,8 @@ // Qt headers #include +class PlaySettings; + class text_subtitle_t { public: @@ -75,7 +77,8 @@ class TextSubtitleParser { public: - static bool LoadSubtitles(QString fileName, TextSubtitles &target); + static bool LoadSubtitles(QString fileName, TextSubtitles &target, + PlaySettings *settings); }; #endif Index: libs/libmythtv/osd.h =================================================================== --- libs/libmythtv/osd.h (revision 23571) +++ libs/libmythtv/osd.h (working copy) @@ -70,6 +70,7 @@ class TeletextViewer; class QStringList; class QDomElement; +class PlaySettings; class OSD : public QObject { @@ -78,7 +79,7 @@ OSD(); ~OSD(void); - void Init(const QRect &totalBounds, int frameRate, + void Init(PlaySettings *settings, const QRect &totalBounds, int frameRate, const QRect &visibleBounds, float visibleAspect, float fontScaling); OSDSurface *Display(void); @@ -278,6 +279,8 @@ OSDListTreeType *runningTreeMenu; QString treeMenuContainer; + PlaySettings *settings; + // EIA-708 captions QString fontname; QString ccfontname; Index: libs/libmythtv/vsync.cpp =================================================================== --- libs/libmythtv/vsync.cpp (revision 23571) +++ libs/libmythtv/vsync.cpp (working copy) @@ -34,6 +34,7 @@ #include "mythcontext.h" #include "mythverbose.h" #include "mythmainwindow.h" +#include "playsettings.h" #ifdef USING_XV #include "videoout_xv.h" @@ -76,12 +77,13 @@ * \brief Returns the most sophisticated video sync method available. */ VideoSync *VideoSync::BestMethod(VideoOutput *video_output, + PlaySettings *settings, uint frame_interval, uint refresh_interval, bool halve_frame_interval) { VideoSync *trial = NULL; tryingVideoSync = true; - bool tryOpenGL = (gContext->GetNumSetting("UseOpenGLVSync", 1) && + bool tryOpenGL = (settings->GetNumSetting("UseOpenGLVSync", 1) && (getenv("NO_OPENGL_VSYNC") == NULL)); // m_forceskip allows for skipping one sync method Index: libs/libmythtv/tv_play.cpp =================================================================== --- libs/libmythtv/tv_play.cpp (revision 23571) +++ libs/libmythtv/tv_play.cpp (working copy) @@ -60,6 +60,7 @@ #include "tv_play_win.h" #include "recordinginfo.h" #include "mythsystemevent.h" +#include "playsettings.h" #if ! HAVE_ROUND #define round(x) ((int) ((x) + 0.5)) @@ -190,7 +191,6 @@ bool inPlaylist, bool initByNetworkCommand) { VERBOSE(VB_PLAYBACK, LOC + "StartTV() -- begin"); - TV *tv = new TV(); bool quitAll = false; bool showDialogs = true; bool playCompleted = false; @@ -201,6 +201,9 @@ if (tvrec) curProgram = new ProgramInfo(*tvrec); + PlaySettings settings(curProgram ? curProgram->playgroup : "Default"); + TV *tv = new TV(&settings); + // Initialize TV if (!tv->Init()) { @@ -231,7 +234,7 @@ if (curProgram) { VERBOSE(VB_PLAYBACK, LOC + "tv->Playback() -- begin"); - if (!tv->Playback(*curProgram)) + if (!tv->Playback(*curProgram, &settings)) { quitAll = true; } @@ -783,7 +786,7 @@ * \brief Performs instance initialiation not requiring access to database. * \sa Init(void) */ -TV::TV(void) +TV::TV(PlaySettings *settings) : // Configuration variables from database baseFilters(""), db_channel_format(" "), @@ -921,6 +924,7 @@ kv[QString("FFRewSpeed%1").arg(i)] = QString::number(ff_rew_def[i]); MythDB::getMythDB()->GetSettings(kv); + settings->AddToMap(kv); // convert from minutes to ms. db_idle_timeout = kv["LiveTVIdleTimeout"].toInt() * 60 * 1000; @@ -934,6 +938,7 @@ db_use_gui_size_for_tv = kv["GuiSizeForTV"].toInt(); db_start_in_guide = kv["WatchTVGuide"].toInt(); db_toggle_bookmark = kv["AltClearSavedPosition"].toInt(); + VERBOSE(VB_GENERAL, QString("db_toggle_bookmark=%1").arg(db_toggle_bookmark)); db_run_jobs_on_remote = kv["JobsRunOnRecordHost"].toInt(); db_use_dvd_bookmark = kv["EnableDVDBookmark"].toInt(); db_continue_embedded = kv["ContinueEmbeddedTVPlay"].toInt(); @@ -1711,7 +1716,7 @@ } -int TV::Playback(const ProgramInfo &rcinfo) +int TV::Playback(const ProgramInfo &rcinfo, PlaySettings *settings) { wantsToQuit = false; jumpToProgram = false; @@ -1725,7 +1730,7 @@ return 0; } - mctx->SetPlayingInfo(&rcinfo); + mctx->SetPlayingInfo(&rcinfo, settings); mctx->SetInitialTVState(false); ScheduleStateChange(mctx); @@ -1808,7 +1813,8 @@ if (fileexists) { - Playback(pginfo); + PlaySettings settings("Default"); + Playback(pginfo, &settings); retval = 1; } @@ -2153,7 +2159,7 @@ { OSD *osd = GetOSDLock(ctx); ctx->LockPlayingInfo(__FILE__, __LINE__); - if (osd && (PlayGroup::GetCount() > 0)) + if (ctx->playingInfo->playgroup != "Default" && osd && (PlayGroup::GetCount() > 0)) osd->SetSettingsText(tr("%1 Settings") .arg(tv_i18n(ctx->playingInfo->playgroup)), 3); ctx->UnlockPlayingInfo(__FILE__, __LINE__); @@ -5165,7 +5171,7 @@ return false; } - InitUDPNotifyEvent(); + InitUDPNotifyEvent(ctx->settings); bool ok = false; if (ctx->IsNullVideoDesired()) { @@ -11817,11 +11823,11 @@ GetMythUI()->RestoreScreensaver(); } -void TV::InitUDPNotifyEvent(void) +void TV::InitUDPNotifyEvent(PlaySettings *settings) { if (db_udpnotify_port && !udpnotify) { - udpnotify = new UDPNotify(db_udpnotify_port); + udpnotify = new UDPNotify(db_udpnotify_port, settings); connect(udpnotify, SIGNAL(AddUDPNotifyEvent( const QString&,const UDPNotifyOSDSet*)), Index: libs/libmythtv/videodisplayprofile.h =================================================================== --- libs/libmythtv/videodisplayprofile.h (revision 23571) +++ libs/libmythtv/videodisplayprofile.h (working copy) @@ -13,6 +13,8 @@ #include "mythcontext.h" +class PlaySettings; + typedef QMap pref_map_t; typedef QMap safe_map_t; typedef QStringList safe_list_t; @@ -80,7 +82,7 @@ class MPUBLIC VideoDisplayProfile { public: - VideoDisplayProfile(); + VideoDisplayProfile(PlaySettings *settings); ~VideoDisplayProfile(); void SetInput(const QSize &size); @@ -121,7 +123,8 @@ static QString GetDecoderName(const QString &decoder); static QString GetDecoderHelp(QString decoder = QString::null); - static QString GetDefaultProfileName(const QString &hostname); + static QString GetDefaultProfileName(const QString &hostname, + PlaySettings *settings); static void SetDefaultProfileName(const QString &profilename, const QString &hostname); static uint GetProfileGroupID(const QString &profilename, Index: libs/libmythtv/videoout_null.cpp =================================================================== --- libs/libmythtv/videoout_null.cpp (revision 23571) +++ libs/libmythtv/videoout_null.cpp (working copy) @@ -27,8 +27,8 @@ opts.priorities->insert("null", 10); } -VideoOutputNull::VideoOutputNull(void) : - VideoOutput(), global_lock(QMutex::Recursive) +VideoOutputNull::VideoOutputNull(PlaySettings *settings) : + VideoOutput(settings), global_lock(QMutex::Recursive) { VERBOSE(VB_PLAYBACK, "VideoOutputNull()"); memset(&av_pause_frame, 0, sizeof(av_pause_frame)); Index: libs/libmythtv/videooutbase.cpp =================================================================== --- libs/libmythtv/videooutbase.cpp (revision 23571) +++ libs/libmythtv/videooutbase.cpp (working copy) @@ -7,6 +7,7 @@ #include "NuppelVideoPlayer.h" #include "videodisplayprofile.h" #include "decoderbase.h" +#include "playsettings.h" #include "mythcontext.h" #include "mythverbose.h" @@ -107,7 +108,8 @@ PIPState pipState, const QSize &video_dim, float video_aspect, WId win_id, const QRect &display_rect, - float video_prate, WId embed_id) + float video_prate, WId embed_id, + PlaySettings *settings) { (void) codec_priv; @@ -152,7 +154,7 @@ QString renderer = QString::null; if (renderers.size() > 0) { - VideoDisplayProfile vprof; + VideoDisplayProfile vprof(settings); vprof.SetInput(video_dim); QString tmp = vprof.GetVideoRenderer(); @@ -180,32 +182,32 @@ #ifdef USING_DIRECTFB if (renderer == "directfb") - vo = new VideoOutputDirectfb(); + vo = new VideoOutputDirectfb(settings); #endif // USING_DIRECTFB #ifdef USING_MINGW if (renderer == "direct3d") - vo = new VideoOutputD3D(); + vo = new VideoOutputD3D(settings); #endif // USING_MINGW #ifdef Q_OS_MACX if (osxlist.contains(renderer)) - vo = new VideoOutputQuartz(codec_id, codec_priv); + vo = new VideoOutputQuartz(settings, codec_id, codec_priv); #endif // Q_OS_MACX #ifdef USING_OPENGL_VIDEO if (renderer == "opengl") - vo = new VideoOutputOpenGL(); + vo = new VideoOutputOpenGL(settings); #endif // USING_OPENGL_VIDEO #ifdef USING_VDPAU if (renderer == "vdpau") - vo = new VideoOutputVDPAU(codec_id); + vo = new VideoOutputVDPAU(settings, codec_id); #endif // USING_VDPAU #ifdef USING_XV if (xvlist.contains(renderer)) - vo = new VideoOutputXv(codec_id); + vo = new VideoOutputXv(settings, codec_id); #endif // USING_XV if (vo) @@ -302,7 +304,7 @@ * \brief This constructor for VideoOutput must be followed by an * Init(int,int,float,WId,int,int,int,int,WId) call. */ -VideoOutput::VideoOutput() : +VideoOutput::VideoOutput(PlaySettings *_settings) : // DB Settings db_display_dim(0,0), db_aspectoverride(kAspect_Off), db_adjustfill(kAdjustFill_Off), @@ -336,35 +338,37 @@ display_res(NULL), // Physical display - monitor_sz(640,480), monitor_dim(400,300) + monitor_sz(640,480), monitor_dim(400,300), + settings(_settings) + { bzero(&pip_tmp_image, sizeof(pip_tmp_image)); - db_display_dim = QSize(gContext->GetNumSetting("DisplaySizeWidth", 0), - gContext->GetNumSetting("DisplaySizeHeight", 0)); + db_display_dim = QSize(settings->GetNumSetting("DisplaySizeWidth", 0), + settings->GetNumSetting("DisplaySizeHeight", 0)); db_pict_attr[kPictureAttribute_Brightness] = - gContext->GetNumSetting("PlaybackBrightness", 50); + settings->GetNumSetting("PlaybackBrightness", 50); db_pict_attr[kPictureAttribute_Contrast] = - gContext->GetNumSetting("PlaybackContrast", 50); + settings->GetNumSetting("PlaybackContrast", 50); db_pict_attr[kPictureAttribute_Colour] = - gContext->GetNumSetting("PlaybackColour", 50); + settings->GetNumSetting("PlaybackColour", 50); db_pict_attr[kPictureAttribute_Hue] = - gContext->GetNumSetting("PlaybackHue", 0); + settings->GetNumSetting("PlaybackHue", 0); db_aspectoverride = (AspectOverrideMode) - gContext->GetNumSetting("AspectOverride", 0); + settings->GetNumSetting("AspectOverride", 0); db_adjustfill = (AdjustFillMode) - gContext->GetNumSetting("AdjustFill", 0); + settings->GetNumSetting("AdjustFill", 0); db_letterbox_colour = (LetterBoxColour) - gContext->GetNumSetting("LetterboxColour", 0); + settings->GetNumSetting("LetterboxColour", 0); db_use_picture_controls = - gContext->GetNumSetting("UseOutputPictureControls", 0); + settings->GetNumSetting("UseOutputPictureControls", 0); if (!gContext->IsDatabaseIgnored()) - db_vdisp_profile = new VideoDisplayProfile(); + db_vdisp_profile = new VideoDisplayProfile(settings); - windows.push_back(VideoOutWindow()); + windows.push_back(VideoOutWindow(settings)); } /** @@ -433,12 +437,12 @@ return QString::null; } -bool VideoOutput::IsPreferredRenderer(QSize video_size) +bool VideoOutput::IsPreferredRenderer(QSize video_size, PlaySettings *settings) { if (!db_vdisp_profile || (video_size == windows[0].GetVideoDispDim())) return true; - VideoDisplayProfile vdisp; + VideoDisplayProfile vdisp(settings); vdisp.SetInput(video_size); QString new_rend = vdisp.GetVideoRenderer(); if (new_rend.isEmpty()) Index: libs/libmythtv/videooutwindow.h =================================================================== --- libs/libmythtv/videooutwindow.h (revision 23571) +++ libs/libmythtv/videooutwindow.h (working copy) @@ -16,11 +16,12 @@ #include "videoouttypes.h" class NuppelVideoPlayer; +class PlaySettings; class VideoOutWindow { public: - VideoOutWindow(); + VideoOutWindow(PlaySettings *settings); bool Init(const QSize &new_video_dim, float aspect, const QRect &new_display_visible_rect, @@ -162,6 +163,8 @@ bool allowpreviewepg; PIPState pip_state; + PlaySettings *settings; + // Constants static const float kManualZoomMaxHorizontalZoom; static const float kManualZoomMaxVerticalZoom; Index: libs/libmythtv/videoout_directfb.h =================================================================== --- libs/libmythtv/videoout_directfb.h (revision 23571) +++ libs/libmythtv/videoout_directfb.h (working copy) @@ -12,7 +12,7 @@ { public: static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); - VideoOutputDirectfb(); + VideoOutputDirectfb(PlaySettings *settings); ~VideoOutputDirectfb(); bool Init(int width, int height, float aspect, WId winid, Index: libs/libmythtv/playercontext.h =================================================================== --- libs/libmythtv/playercontext.h (revision 23571) +++ libs/libmythtv/playercontext.h (working copy) @@ -27,6 +27,7 @@ class LiveTVChain; class MythDialog; class QPainter; +class PlaySettings; typedef enum { @@ -90,7 +91,7 @@ void SetRecorder(RemoteEncoder *rec); void SetTVChain(LiveTVChain *chain); void SetRingBuffer(RingBuffer *buf); - void SetPlayingInfo(const ProgramInfo *info); + void SetPlayingInfo(const ProgramInfo *info, PlaySettings *settings=NULL); void SetPlayGroup(const QString &group); void SetPseudoLiveTV(const ProgramInfo *pi, PseudoState new_state); void SetPIPLocation(int loc) { pipLocation = loc; } @@ -145,6 +146,7 @@ LiveTVChain *tvchain; RingBuffer *buffer; ProgramInfo *playingInfo; ///< Currently playing info + PlaySettings *settings; // corresponding to playingInfo long long playingLen; ///< Initial CalculateLength() bool nohardwaredecoders; // < Disable use of VDPAU decoding bool decoding; ///< Video decoder thread started Index: libs/libmythtv/vsync.h =================================================================== --- libs/libmythtv/vsync.h (revision 23571) +++ libs/libmythtv/vsync.h (working copy) @@ -101,6 +101,7 @@ // documented in vsync.cpp static VideoSync *BestMethod(VideoOutput*, + PlaySettings *settings, uint frame_interval, uint refresh_interval, bool interlaced); protected: Index: libs/libmythtv/videoout_xv.h =================================================================== --- libs/libmythtv/videoout_xv.h (revision 23571) +++ libs/libmythtv/videoout_xv.h (working copy) @@ -51,7 +51,7 @@ friend class XvMCOSD; public: static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); - VideoOutputXv(MythCodecID av_codec_id); + VideoOutputXv(PlaySettings *settings, MythCodecID av_codec_id); ~VideoOutputXv(); bool Init(int width, int height, float aspect, WId winid, @@ -109,9 +109,11 @@ static MythCodecID GetBestSupportedCodec(uint width, uint height, uint osd_width, uint osd_height, uint stream_type, int xvmc_chroma, - bool test_surface, bool force_xv); + bool test_surface, bool force_xv, + PlaySettings *settings); static int GrabSuitableXvPort(MythXDisplay* disp, Window root, + PlaySettings *settings, MythCodecID type, uint width, uint height, bool &xvsetdefaults, Index: libs/libmythtv/videoout_xv.cpp =================================================================== --- libs/libmythtv/videoout_xv.cpp (revision 23571) +++ libs/libmythtv/videoout_xv.cpp (working copy) @@ -166,8 +166,8 @@ * \see VideoOutput, VideoBuffers * */ -VideoOutputXv::VideoOutputXv(MythCodecID codec_id) - : VideoOutput(), +VideoOutputXv::VideoOutputXv(PlaySettings *settings, MythCodecID codec_id) + : VideoOutput(settings), myth_codec_id(codec_id), video_output_subtype(XVUnknown), global_lock(QMutex::Recursive), @@ -408,6 +408,7 @@ * \return port number if it succeeds, else -1. */ int VideoOutputXv::GrabSuitableXvPort(MythXDisplay* disp, Window root, + PlaySettings *settings, MythCodecID mcodecid, uint width, uint height, bool &xvsetdefaults, @@ -492,7 +493,7 @@ } // figure out if we want chromakeying.. - VideoDisplayProfile vdp; + VideoDisplayProfile vdp(settings); vdp.SetInput(QSize(width, height)); bool check_for_colorkey = (vdp.GetOSDRenderer() == "chromakey"); @@ -785,7 +786,7 @@ disp->StartLog(); QString adaptor_name = QString::null; const QSize video_dim = windows[0].GetVideoDim(); - xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), mcodecid, + xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, mcodecid, video_dim.width(), video_dim.height(), xv_set_defaults, xvmc_chroma, &xvmc_surf_info, &adaptor_name); @@ -864,7 +865,7 @@ disp->StartLog(); QString adaptor_name = QString::null; const QSize video_dim = windows[0].GetVideoDim(); - xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), kCodec_MPEG2, + xv_port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, kCodec_MPEG2, video_dim.width(), video_dim.height(), xv_set_defaults, 0, NULL, &adaptor_name); if (xv_port == -1) @@ -1018,7 +1019,8 @@ uint width, uint height, uint osd_width, uint osd_height, uint stream_type, int xvmc_chroma, - bool test_surface, bool force_xv) + bool test_surface, bool force_xv, + PlaySettings *settings) { (void)width, (void)height, (void)osd_width, (void)osd_height; (void)stream_type, (void)xvmc_chroma, (void)test_surface; @@ -1029,7 +1031,7 @@ return ret; #ifdef USING_XVMC - VideoDisplayProfile vdp; + VideoDisplayProfile vdp(settings); vdp.SetInput(QSize(width, height)); QString dec = vdp.GetDecoder(); if ((dec == "libmpeg2") || (dec == "ffmpeg")) @@ -1079,7 +1081,7 @@ ok = false; bool dummy; - int port = GrabSuitableXvPort(disp, disp->GetRoot(), ret, width, height, + int port = GrabSuitableXvPort(disp, disp->GetRoot(), settings, ret, width, height, dummy, xvmc_chroma, &info); if (port >= 0) { Index: libs/libmythtv/udpnotify.cpp =================================================================== --- libs/libmythtv/udpnotify.cpp (revision 23571) +++ libs/libmythtv/udpnotify.cpp (working copy) @@ -31,6 +31,7 @@ #include "udpnotify.h" #include "mythcontext.h" #include "mythverbose.h" +#include "playsettings.h" UDPNotifyOSDSet::UDPNotifyOSDSet(const QString &name, uint timeout) : m_name(name), m_timeout(timeout) @@ -73,7 +74,7 @@ ///////////////////////////////////////////////////////////////////////// -UDPNotify::UDPNotify(uint udp_port) : +UDPNotify::UDPNotify(uint udp_port, PlaySettings *settings) : m_socket(new QUdpSocket()), m_db_osd_udpnotify_timeout(5) { connect(m_socket, SIGNAL(readyRead()), @@ -81,7 +82,7 @@ m_socket->bind(udp_port); - m_db_osd_udpnotify_timeout = gContext->GetNumSetting("OSDNotifyTimeout", 5); + m_db_osd_udpnotify_timeout = settings->GetNumSetting("OSDNotifyTimeout", 5); } void UDPNotify::deleteLater(void) Index: libs/libmythtv/videooutbase.h =================================================================== --- libs/libmythtv/videooutbase.h (revision 23571) +++ libs/libmythtv/videooutbase.h (working copy) @@ -29,6 +29,7 @@ class FilterChain; class FilterManager; class OpenGLContextGLX; +class PlaySettings; typedef QMap PIPMap; @@ -49,9 +50,10 @@ PIPState pipState, const QSize &video_dim, float video_aspect, WId win_id, const QRect &display_rect, - float video_prate, WId embed_id); + float video_prate, WId embed_id, + PlaySettings *settings); - VideoOutput(); + VideoOutput(PlaySettings *settings); virtual ~VideoOutput(); virtual bool Init(int width, int height, float aspect, @@ -59,7 +61,7 @@ int winh, WId embedid = 0); virtual void InitOSD(OSD *osd); virtual void SetVideoFrameRate(float); - virtual bool IsPreferredRenderer(QSize video_size); + virtual bool IsPreferredRenderer(QSize video_size, PlaySettings *settings); virtual bool SetDeinterlacingEnabled(bool); virtual bool SetupDeinterlace(bool i, const QString& ovrf=""); virtual void FallbackDeint(void); @@ -328,6 +330,8 @@ // Display information QSize monitor_sz; QSize monitor_dim; + + PlaySettings *settings; }; #endif Index: libs/libmythtv/textsubtitleparser.cpp =================================================================== --- libs/libmythtv/textsubtitleparser.cpp (revision 23571) +++ libs/libmythtv/textsubtitleparser.cpp (working copy) @@ -21,6 +21,7 @@ #include "RingBuffer.h" #include "textsubtitleparser.h" #include "xine_demux_sputext.h" +#include "playsettings.h" bool operator<(const text_subtitle_t& left, const text_subtitle_t& right) @@ -112,7 +113,8 @@ m_subtitles.clear(); } -bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target) +bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target, + PlaySettings *settings) { demux_sputext_t sub_data; sub_data.rbuffer = new RingBuffer(fileName, 0, false); @@ -130,7 +132,7 @@ target.SetFrameBasedTiming(!sub_data.uses_time); QTextCodec *textCodec = NULL; - QString codec = gContext->GetSetting("SubtitleCodec", ""); + QString codec = settings->GetSetting("SubtitleCodec", ""); if (!codec.isEmpty()) textCodec = QTextCodec::codecForName(codec.toLatin1()); if (!textCodec) Index: libs/libmythtv/osd.cpp =================================================================== --- libs/libmythtv/osd.cpp (revision 23571) +++ libs/libmythtv/osd.cpp (working copy) @@ -32,6 +32,7 @@ #include "mythverbose.h" #include "util.h" #include "channelutil.h" +#include "playsettings.h" #include "x11colors.h" #include "mythdirs.h" @@ -42,7 +43,7 @@ static char *cc708_default_font_names[16]; static bool cc708_defaults_initialized = false; static QMutex cc708_init_lock; -static void initialize_osd_fonts(void); +static void initialize_osd_fonts(PlaySettings *settings); #define LOC QString("OSD: ") #define LOC_ERR QString("OSD, Error: ") @@ -76,6 +77,7 @@ editarrowRect(), drawSurface(NULL), changed(false), runningTreeMenu(NULL), treeMenuContainer(""), + settings(NULL), // EIA-608 captions fontname(""), ccfontname(""), fontSizeType(""), @@ -155,9 +157,10 @@ } } -void OSD::Init(const QRect &osd_bounds, int frameRate, +void OSD::Init(PlaySettings *_settings, const QRect &osd_bounds, int frameRate, const QRect &vis_bounds, float visibleAspect, float fontScaling) { + settings = _settings; removeHTML.setMinimal(true); fscale = fontScaling; @@ -172,7 +175,7 @@ drawSurface = new OSDSurface(osd_bounds.width(), osd_bounds.height()); if (!cc708_defaults_initialized) - initialize_osd_fonts(); + initialize_osd_fonts(settings); for (uint i = 0; i < 16; i++) cc708fontnames[i] = cc708_default_font_names[i]; @@ -238,7 +241,7 @@ QString name = "cc_font"; int fontsize = m_themeinfo->BaseRes()->height() / 27; - ccfont = LoadFont(gContext->GetSetting("OSDCCFont"), fontsize); + ccfont = LoadFont(settings->GetSetting("OSDCCFont", ""), fontsize); if (ccfont) fontMap[name] = ccfont; @@ -274,7 +277,7 @@ OSDTypeCC *ccpage = new OSDTypeCC(name, ccfont, sub_xoff, sub_yoff, - sub_dispw, sub_disph, wmult, hmult); + sub_dispw, sub_disph, wmult, hmult, settings); container->AddType(ccpage); return true; } @@ -293,7 +296,7 @@ // Create fonts... TTFFont* ccfonts[48]; - uint z = gContext->GetNumSetting("OSDCC708TextZoom", 100) * + uint z = settings->GetNumSetting("OSDCC708TextZoom", 100) * m_themeinfo->BaseRes()->height(); uint fontsizes[3] = { z / 3600, z / 2900, z / 2200 }; for (uint i = 0; i < 48; i++) @@ -356,7 +359,7 @@ if (!font) { int fontsize = 440 / 26; - font = LoadFont(gContext->GetSetting("OSDCCFont"), fontsize); + font = LoadFont(settings->GetSetting("OSDCCFont", ""), fontsize); if (font) fontMap[fontname] = font; @@ -464,7 +467,7 @@ TTFFont *font = GetFont(fontname); if (!font) { - font = LoadFont(gContext->GetSetting("OSDCCFont"), SUBTITLE_FONT_SIZE); + font = LoadFont(settings->GetSetting("OSDCCFont", ""), SUBTITLE_FONT_SIZE); if (font) { @@ -532,7 +535,7 @@ if (!actfont) { - actfont = LoadFont(gContext->GetSetting("OSDFont"), 16); + actfont = LoadFont(settings->GetSetting("OSDFont", ""), 16); if (actfont) fontMap["treemenulistfont"] = actfont; @@ -848,7 +851,7 @@ void OSD::parseFont(QDomElement &element) { QString name; - QString fontfile = gContext->GetSetting("OSDFont"); + QString fontfile = settings->GetSetting("OSDFont", ""); int size = -1; int sizeSmall = -1; int sizeBig = -1; @@ -926,7 +929,7 @@ return; } - QString fontSizeType = gContext->GetSetting("OSDThemeFontSizeType", + QString fontSizeType = settings->GetSetting("OSDThemeFontSizeType", "default"); if (fontSizeType == "small") { @@ -3107,16 +3110,16 @@ return QRect(xoffset, yoffset, displaywidth, displayheight); } -#define OSD_STRDUP(X) strdup(gContext->GetSetting(X).toLocal8Bit().constData()) +#define OSD_STRDUP(X) strdup(settings->GetSetting(X, "").toLocal8Bit().constData()) -static void initialize_osd_fonts(void) +static void initialize_osd_fonts(PlaySettings *settings) { QMutexLocker locker(&cc708_init_lock); if (cc708_defaults_initialized) return; cc708_defaults_initialized = true; - QString default_font_type = gContext->GetSetting( + QString default_font_type = settings->GetSetting( "OSDCC708DefaultFontType", "MonoSerif"); // 0 Index: libs/libmythtv/videoout_quartz.h =================================================================== --- libs/libmythtv/videoout_quartz.h (revision 23571) +++ libs/libmythtv/videoout_quartz.h (working copy) @@ -3,6 +3,7 @@ class DVDV; struct QuartzData; +class PlaySettings; #include "videooutbase.h" @@ -10,7 +11,7 @@ { public: static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); - VideoOutputQuartz(MythCodecID av_codec_id, void *codec_priv); + VideoOutputQuartz(PlaySettings *settings, MythCodecID av_codec_id, void *codec_priv); ~VideoOutputQuartz(); bool Init(int width, int height, float aspect, WId winid, @@ -51,7 +52,7 @@ static MythCodecID GetBestSupportedCodec( uint width, uint height, uint osd_width, uint osd_height, - uint stream_type, uint fourcc); + uint stream_type, uint fourcc, PlaySettings *settings); virtual bool NeedExtraAudioDecode(void) const { return !codec_is_std(myth_codec_id); } Index: libs/libmythtv/videodisplayprofile.cpp =================================================================== --- libs/libmythtv/videodisplayprofile.cpp (revision 23571) +++ libs/libmythtv/videodisplayprofile.cpp (working copy) @@ -8,6 +8,7 @@ #include "mythverbose.h" #include "videooutbase.h" #include "avformatdecoder.h" +#include "playsettings.h" bool ProfileItem::IsMatch(const QSize &size, float rate) const { @@ -211,7 +212,7 @@ pref_map_t VideoDisplayProfile::dec_name; safe_list_t VideoDisplayProfile::safe_decoders; -VideoDisplayProfile::VideoDisplayProfile() +VideoDisplayProfile::VideoDisplayProfile(PlaySettings *settings) : lock(QMutex::Recursive), last_size(0,0), last_rate(0.0f), last_video_renderer(QString::null) { @@ -219,7 +220,7 @@ init_statics(); QString hostname = gContext->GetHostName(); - QString cur_profile = GetDefaultProfileName(hostname); + QString cur_profile = GetDefaultProfileName(hostname, settings); uint groupid = GetProfileGroupID(cur_profile, hostname); item_list_t items = LoadDB(groupid); @@ -771,9 +772,9 @@ return list; } -QString VideoDisplayProfile::GetDefaultProfileName(const QString &hostname) +QString VideoDisplayProfile::GetDefaultProfileName(const QString &hostname, PlaySettings *settings) { - QString tmp = + QString tmp = settings ? settings->GetSetting("DefaultVideoPlaybackProfile", "") : gContext->GetSettingOnHost("DefaultVideoPlaybackProfile", hostname); QStringList profiles = GetProfiles(hostname); Index: libs/libmythtv/udpnotify.h =================================================================== --- libs/libmythtv/udpnotify.h (revision 23571) +++ libs/libmythtv/udpnotify.h (working copy) @@ -20,6 +20,7 @@ class QByteArray; class QUdpSocket; class QDomElement; +class PlaySettings; class UDPNotifyOSDSet { @@ -54,7 +55,7 @@ Q_OBJECT public: - UDPNotify(uint udp_port); + UDPNotify(uint udp_port, PlaySettings *settings); signals: void AddUDPNotifyEvent(const QString &name, const UDPNotifyOSDSet*); Index: libs/libmythtv/videoout_null.h =================================================================== --- libs/libmythtv/videoout_null.h (revision 23571) +++ libs/libmythtv/videoout_null.h (working copy) @@ -9,7 +9,7 @@ { public: static void GetRenderOptions(render_opts &opts, QStringList &cpudeints); - VideoOutputNull(); + VideoOutputNull(PlaySettings *settings); ~VideoOutputNull(); bool Init(int width, int height, float aspect, WId winid, Index: libs/libmyth/settings.cpp =================================================================== --- libs/libmyth/settings.cpp (revision 23571) +++ libs/libmyth/settings.cpp (working copy) @@ -235,6 +235,19 @@ return -1; } +QString SelectSetting::getValueLabel(const QString &value) +{ + selectionList::const_iterator iterValues = values.begin(); + selectionList::const_iterator iterLabels = labels.begin(); + for (; iterValues != values.end() && iterLabels != labels.end(); ++iterValues, ++iterLabels) + { + if (*iterValues == value) + return *iterLabels; + } + + return "???"; +} + bool SelectSetting::ReplaceLabel(const QString &new_label, const QString &value) { int i = getValueIndex(value); @@ -878,18 +891,19 @@ QWidget* CheckBoxSetting::configWidget(ConfigurationGroup *cg, QWidget* parent, const char* widgetName) { - widget = new MythCheckBox(parent, widgetName); + widget = new MythCheckBox(parent, widgetName, isTristate); connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(widgetDeleted(QObject*))); widget->setHelpText(getHelpText()); widget->setText(getLabel()); - widget->setChecked(boolValue()); + widget->setCheckState(tristateValue()); + setValue(tristateValue()); - connect(widget, SIGNAL(toggled(bool)), - this, SLOT(setValue(bool))); - connect(this, SIGNAL(valueChanged(bool)), - widget, SLOT(setChecked(bool))); + connect(widget, SIGNAL(stateChanged(int)), + this, SLOT(setValue(int))); + connect(this, SIGNAL(valueChanged(int)), + this, SLOT(relayValueChanged(int))); if (cg) connect(widget, SIGNAL(changeHelpText(QString)), cg, @@ -905,7 +919,7 @@ void CheckBoxSetting::setEnabled(bool fEnabled) { - BooleanSetting::setEnabled(fEnabled); + TristateSetting::setEnabled(fEnabled); if (widget) widget->setEnabled(fEnabled); } @@ -914,9 +928,39 @@ { if (widget) widget->setHelpText(str); - BooleanSetting::setHelpText(str); + TristateSetting::setHelpText(str); } +const char *TristateSetting::kPartiallyCheckedString = "default"; + +void CheckBoxSetting::setValue(int check) +{ + if (widget) + { + QFont f = widget->font(); + if (check == Qt::Checked) + f.setWeight(QFont::Bold); + else if (check == Qt::Unchecked) + f.setWeight(QFont::Bold); + else + f.setWeight(QFont::Light); + widget->setFont(f); + } + TristateSetting::setValue(check); + emit valueChanged(check); +} + +void TristateSetting::setValue(int check) +{ + if (check == Qt::Checked) + Setting::setValue("1"); + else if (check == Qt::Unchecked) + Setting::setValue("0"); + else + Setting::setValue(kPartiallyCheckedString); + emit valueChanged(check); +} + void AutoIncrementDBSetting::Save(QString table) { if (intValue() == 0) Index: libs/libmyth/settings.h =================================================================== --- libs/libmyth/settings.h (revision 23571) +++ libs/libmyth/settings.h (working copy) @@ -290,6 +290,7 @@ virtual QString getSelectionLabel(void) const; virtual int getValueIndex(QString value); + virtual QString getValueLabel(const QString &value); protected: virtual bool ReplaceLabel( @@ -463,10 +464,40 @@ void valueChanged(bool); }; -class MPUBLIC CheckBoxSetting: public BooleanSetting { +class MPUBLIC TristateSetting : public Setting +{ + Q_OBJECT + + public: + TristateSetting(Storage *_storage) : Setting(_storage) {} + + Qt::CheckState tristateValue(void) const { + if (getValue() == "0") + return Qt::Unchecked; + if (getValue() == "1") + return Qt::Checked; + return Qt::PartiallyChecked; + }; + + bool boolValue(void) const { + return getValue().toInt() != 0; + }; + + static const char *kPartiallyCheckedString; + +public slots: + virtual void setValue(/*Qt::CheckState*/int check); + +signals: + void valueChanged(int); +}; + +class MPUBLIC CheckBoxSetting: public TristateSetting { + Q_OBJECT + public: - CheckBoxSetting(Storage *_storage) : - BooleanSetting(_storage), widget(NULL) { } + CheckBoxSetting(Storage *_storage, bool _isTristate=false) : + TristateSetting(_storage), widget(NULL), isTristate(_isTristate) { } virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, const char* widgetName = 0); virtual void widgetInvalid(QObject*); @@ -475,8 +506,17 @@ virtual void setHelpText(const QString &str); + +public slots: + virtual void setValue(/*Qt::CheckState*/int check); + virtual void relayValueChanged(int state) { + if (widget) + widget->setCheckState((Qt::CheckState)state); + } + protected: MythCheckBox *widget; + bool isTristate; }; class MPUBLIC PathSetting : public ComboBoxSetting Index: libs/libmyth/mythwidgets.cpp =================================================================== --- libs/libmyth/mythwidgets.cpp (revision 23571) +++ libs/libmyth/mythwidgets.cpp (working copy) @@ -223,7 +223,15 @@ else if (action == "DOWN") focusNextPrevChild(true); else if (action == "LEFT" || action == "RIGHT" || action == "SELECT") - toggle(); + { + if (isTristate()) + { + Qt::CheckState newState = (Qt::CheckState)(((int)checkState() + 1) % 3); + setCheckState(newState); + } + else + toggle(); + } else handled = false; } Index: libs/libmyth/mythwidgets.h =================================================================== --- libs/libmyth/mythwidgets.h (revision 23571) +++ libs/libmyth/mythwidgets.h (working copy) @@ -329,11 +329,11 @@ Q_OBJECT public: - MythCheckBox(QWidget *parent = 0, const char *name = "MythCheckBox") - : QCheckBox(parent) { setObjectName(name); }; + MythCheckBox(QWidget *parent = 0, const char *name = "MythCheckBox", bool isTristate = false) + : QCheckBox(parent) { setObjectName(name); setTristate(isTristate); }; MythCheckBox(const QString &text, - QWidget *parent = 0, const char *name = "MythCheckBox") - : QCheckBox(text, parent) { setObjectName(name); }; + QWidget *parent = 0, const char *name = "MythCheckBox", bool isTristate = false) + : QCheckBox(text, parent) { setObjectName(name); setTristate(isTristate); }; void setHelpText(const QString&); Index: programs/mythfrontend/globalsettings.cpp =================================================================== --- programs/mythfrontend/globalsettings.cpp (revision 23571) +++ programs/mythfrontend/globalsettings.cpp (working copy) @@ -37,7 +37,79 @@ #include "mythconfig.h" #include "mythdirs.h" #include "mythuihelper.h" +#include "playsettings.h" +#define CREATE_CHECKBOX_SETTING(var, name, settings) \ + CheckBoxSetting *var; \ + if ((settings)) \ + var = new PlaySettingsCheckBox((name), (settings), true); \ + else \ + var = new HostCheckBox((name)) + +#define CREATE_COMBOBOX_SETTING(var, name, settings) \ + ComboBoxSetting *var; \ + if ((settings)) \ + var = new PlaySettingsComboBox((name), (settings)); \ + else \ + var = new HostComboBox((name)) + +#define CREATE_SPINBOX_SETTING(var, name, settings, arg1, arg2, arg3, arg4) \ + SpinBoxSetting *var; \ + if ((settings)) \ + var = new PlaySettingsSpinBox((name), (settings), (arg1), (arg2), (arg3), (arg4)); \ + else \ + var = new HostSpinBox((name), (arg1), (arg2), (arg3), (arg4)) + +#define CREATE_LINEEDIT_SETTING(var, name, settings) \ + LineEditSetting *var; \ + if ((settings)) \ + var = new PlaySettingsLineEdit((name), (settings), ""); \ + else \ + var = new HostLineEdit((name)) + +static Configurable *wrap(Configurable *obj, PlaySettings *settings, + bool twoLineLabel=false) +{ + if (!settings) + return obj; + + // Get the setting name + PlaySettingsCombinedStorage *storage = + dynamic_cast(obj); + const QString &name = storage->getName(); + + // Get the default label, which may be different depending on the + // object type + QString defaultLabel = settings->GetSetting(name, "", true); + if (dynamic_cast(obj)) + defaultLabel = (defaultLabel == "0" || defaultLabel == "" ? + QObject::tr("disabled") : QObject::tr("enabled")); + if (dynamic_cast(obj) && defaultLabel == "") + defaultLabel = "0"; + ComboBoxSetting *cb = dynamic_cast(obj); + if (cb) + { + defaultLabel = cb->getValueLabel(defaultLabel); + // Add the default selection to a ComboBox + cb->addSelection(QString("(") + QObject::tr("default") + ")", + storage->getDefault(), !settings->IsOverridden(name)); + } + + // Change the help text to include the default. + if (dynamic_cast(obj)) + obj->setHelpText(QObject::tr("Leave blank to keep default value") + + " (" + defaultLabel + "). " + obj->getHelpText()); + else + obj->setHelpText(QObject::tr("Override default value") + + " (" + defaultLabel + "). " + obj->getHelpText()); + + // Change the label to include the default. + obj->setLabel(obj->getLabel() + (twoLineLabel ? "\n" : "") + + " (" + defaultLabel + ")"); + + return obj; +} + static HostComboBox *AudioOutputDevice() { HostComboBox *gc = new HostComboBox("AudioOutputDevice", true); @@ -309,9 +381,9 @@ return gc; } -static HostCheckBox *DecodeExtraAudio() +static Configurable *DecodeExtraAudio(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("DecodeExtraAudio"); + CREATE_CHECKBOX_SETTING(gc, "DecodeExtraAudio", settings); gc->setLabel(QObject::tr("Extra audio buffering")); gc->setValue(true); gc->setHelpText(QObject::tr("Enable this setting if MythTV is playing " @@ -320,17 +392,17 @@ "effect on framegrabbers (MPEG-4/RTJPEG). MythTV will " "keep extra audio data in its internal buffers to workaround " "this bug.")); - return gc; + return wrap(gc, settings); } -static HostComboBox *PIPLocationComboBox() +static Configurable *PIPLocationComboBox(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("PIPLocation"); + CREATE_COMBOBOX_SETTING(gc, "PIPLocation", settings); gc->setLabel(QObject::tr("PIP Video Location")); for (uint loc = 0; loc < kPIP_END; ++loc) gc->addSelection(toString((PIPLocation) loc), QString::number(loc)); gc->setHelpText(QObject::tr("Location of PIP Video window.")); - return gc; + return wrap(gc, settings); } static GlobalLineEdit *AllRecGroupPassword() @@ -427,25 +499,25 @@ return gc; } -static HostCheckBox *SmartForward() +static Configurable *SmartForward(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("SmartForward"); + CREATE_CHECKBOX_SETTING(gc, "SmartForward", settings); gc->setLabel(QObject::tr("Smart Fast Forwarding")); gc->setValue(false); gc->setHelpText(QObject::tr("If enabled, then immediately after " "rewinding, only skip forward the same amount as " "skipping backwards.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *ExactSeeking() +static Configurable *ExactSeeking(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("ExactSeeking"); + CREATE_CHECKBOX_SETTING(gc, "ExactSeeking", settings); gc->setLabel(QObject::tr("Seek to exact frame")); gc->setValue(false); gc->setHelpText(QObject::tr("If enabled, seeking is frame exact, but " "slower.")); - return gc; + return wrap(gc, settings); } static GlobalComboBox *CommercialSkipMethod() @@ -463,9 +535,9 @@ return bc; } -static HostComboBox *AutoCommercialSkip() +static Configurable *AutoCommercialSkip(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("AutoCommercialSkip"); + CREATE_COMBOBOX_SETTING(gc, "AutoCommercialSkip", settings); gc->setLabel(QObject::tr("Automatically Skip Commercials")); gc->addSelection(QObject::tr("Off"), "0"); gc->addSelection(QObject::tr("Notify, but do not skip"), "2"); @@ -474,7 +546,7 @@ "have been flagged during Automatic Commercial Flagging " "or by the mythcommflag program, or just notify that a " "commercial has been detected.")); - return gc; + return wrap(gc, settings); } static GlobalCheckBox *AutoCommercialFlag() @@ -559,26 +631,26 @@ return bc; } -static HostSpinBox *CommRewindAmount() +static Configurable *CommRewindAmount(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("CommRewindAmount", 0, 10, 1); + CREATE_SPINBOX_SETTING(gs, "CommRewindAmount", settings, 0, 10, 1, false); gs->setLabel(QObject::tr("Commercial Skip Auto-Rewind Amount")); gs->setHelpText(QObject::tr("If set, MythTV will automatically rewind " "this many seconds after performing a commercial skip.")); gs->setValue(0); - return gs; + return wrap(gs, settings); } -static HostSpinBox *CommNotifyAmount() +static Configurable *CommNotifyAmount(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("CommNotifyAmount", 0, 10, 1); + CREATE_SPINBOX_SETTING(gs, "CommNotifyAmount", settings, 0, 10, 1, false); gs->setLabel(QObject::tr("Commercial Skip Notify Amount")); gs->setHelpText(QObject::tr("If set, MythTV will act like a commercial " "begins this many seconds early. This can be useful " "when commercial notification is used in place of " "automatic skipping.")); gs->setValue(0); - return gs; + return wrap(gs, settings); } static GlobalSpinBox *MaximumCommercialSkip() @@ -1368,11 +1440,15 @@ labels[j]->setValue(label_i); } -PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str) : +PlaybackProfileConfigs::PlaybackProfileConfigs(const QString &str, PlaySettings *settings) : TriggeredConfigurationGroup(false, true, true, true, false, false, true, true), grouptrigger(NULL) { setLabel(QObject::tr("Playback Profiles") + str); + if (settings) + setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + getLabel()); QString host = gContext->GetHostName(); QStringList profiles = VideoDisplayProfile::GetProfiles(host); @@ -1400,18 +1476,24 @@ profiles = VideoDisplayProfile::GetProfiles(host); } - QString profile = VideoDisplayProfile::GetDefaultProfileName(host); + QString profile = VideoDisplayProfile::GetDefaultProfileName(host, settings); if (!profiles.contains(profile)) { profile = (profiles.contains("Normal")) ? "Normal" : profiles[0]; VideoDisplayProfile::SetDefaultProfileName(profile, host); } - grouptrigger = new HostComboBox("DefaultVideoPlaybackProfile"); + CREATE_COMBOBOX_SETTING(gs, "DefaultVideoPlaybackProfile", settings); + grouptrigger = gs; grouptrigger->setLabel(QObject::tr("Current Video Playback Profile")); QStringList::const_iterator it; for (it = profiles.begin(); it != profiles.end(); ++it) grouptrigger->addSelection(ProgramInfo::i18n(*it), *it); + if (settings) + { + addChild(wrap(grouptrigger, settings)); + return; + } HorizontalConfigurationGroup *grp = new HorizontalConfigurationGroup(false, false, true, true); @@ -1544,9 +1626,9 @@ return gc; } -static HostSpinBox *FFRewReposTime() +static Configurable *FFRewReposTime(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("FFRewReposTime", 0, 200, 5); + CREATE_SPINBOX_SETTING(gs, "FFRewReposTime", settings, 0, 200, 5, false); gs->setLabel(QObject::tr("Fast forward/rewind reposition amount")); gs->setValue(100); gs->setHelpText(QObject::tr("When exiting sticky keys fast forward/rewind " @@ -1554,12 +1636,12 @@ "resuming normal playback. This " "compensates for the reaction time between seeing " "where to resume playback and actually exiting seeking.")); - return gs; + return wrap(gs, settings); } -static HostCheckBox *FFRewReverse() +static Configurable *FFRewReverse(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("FFRewReverse"); + CREATE_CHECKBOX_SETTING(gc, "FFRewReverse", settings); gc->setLabel(QObject::tr("Reverse direction in fast forward/rewind")); gc->setValue(true); gc->setHelpText(QObject::tr("If enabled, pressing the sticky rewind key " @@ -1567,37 +1649,37 @@ "vice versa. If disabled, it will decrease the " "current speed or switch to play mode if " "the speed can't be decreased further.")); - return gc; + return wrap(gc, settings); } -static HostSpinBox *OSDGeneralTimeout() +static Configurable *OSDGeneralTimeout(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("OSDGeneralTimeout", 1, 30, 1); + CREATE_SPINBOX_SETTING(gs, "OSDGeneralTimeout", settings, 1, 30, 1, false); gs->setLabel(QObject::tr("General OSD time-out (sec)")); gs->setValue(2); gs->setHelpText(QObject::tr("Length of time an on-screen display " "window will be visible.")); - return gs; + return wrap(gs, settings); } -static HostSpinBox *OSDProgramInfoTimeout() +static Configurable *OSDProgramInfoTimeout(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("OSDProgramInfoTimeout", 1, 30, 1); + CREATE_SPINBOX_SETTING(gs, "OSDProgramInfoTimeout", settings, 1, 30, 1, false); gs->setLabel(QObject::tr("Program Info OSD time-out")); gs->setValue(3); gs->setHelpText(QObject::tr("Length of time the on-screen display " "will display program information.")); - return gs; + return wrap(gs, settings); } -static HostSpinBox *OSDNotifyTimeout() +static Configurable *OSDNotifyTimeout(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("OSDNotifyTimeout", 1, 30, 1); + CREATE_SPINBOX_SETTING(gs, "OSDNotifyTimeout", settings, 1, 30, 1, false); gs->setLabel(QObject::tr("UDP Notify OSD time-out")); gs->setValue(5); gs->setHelpText(QObject::tr("How many seconds an on-screen display " "will be active for UDP Notify events.")); - return gs; + return wrap(gs, settings); } static HostSpinBox *ThemeCacheSize() @@ -1641,9 +1723,9 @@ return gc; } -static HostComboBox *OSDFont() +static Configurable *OSDFont(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("OSDFont"); + CREATE_COMBOBOX_SETTING(gc, "OSDFont", settings); gc->setLabel(QObject::tr("OSD font")); QDir ttf(GetFontsDir(), GetFontsNameFilter()); gc->fillSelectionsFromDir(ttf, false); @@ -1651,18 +1733,18 @@ if (gc->findSelection(defaultOSDFont) > -1) gc->setValue(defaultOSDFont); - return gc; + return wrap(gc, settings); } -static HostComboBox *OSDCCFont() +static Configurable *OSDCCFont(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("OSDCCFont"); + CREATE_COMBOBOX_SETTING(gc, "OSDCCFont", settings); gc->setLabel(QObject::tr("CC font")); QDir ttf(GetFontsDir(), GetFontsNameFilter()); gc->fillSelectionsFromDir(ttf, false); gc->setHelpText(QObject::tr("Closed Caption font")); - return gc; + return wrap(gc, settings); } static HostComboBox __attribute__ ((unused)) *DecodeVBIFormat() @@ -1683,19 +1765,19 @@ return gc; } -static HostSpinBox *OSDCC708TextZoomPercentage(void) +static Configurable *OSDCC708TextZoomPercentage(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("OSDCC708TextZoom", 50, 200, 5); + CREATE_SPINBOX_SETTING(gs, "OSDCC708TextZoom", settings, 50, 200, 5, false); gs->setLabel(QObject::tr("Text zoom percentage")); gs->setValue(100); gs->setHelpText(QObject::tr("Use this to enlarge or shrink captions.")); - return gs; + return wrap(gs, settings); } -static HostComboBox *OSDCC708DefaultFontType(void) +static Configurable *OSDCC708DefaultFontType(PlaySettings *settings) { - HostComboBox *hc = new HostComboBox("OSDCC708DefaultFontType"); + CREATE_COMBOBOX_SETTING(hc, "OSDCC708DefaultFontType", settings); hc->setLabel(QObject::tr("Default Caption Font Type")); hc->setHelpText( QObject::tr("This allows you to set which font type to use " @@ -1718,17 +1800,21 @@ }; for (uint i = 0; i < 7; ++i) hc->addSelection(typeNames[i], types[i]); - return hc; + return wrap(hc, settings); } -static VerticalConfigurationGroup *OSDCC708Settings(void) +static VerticalConfigurationGroup *OSDCC708Settings(PlaySettings *settings) { VerticalConfigurationGroup *grp = new VerticalConfigurationGroup(false, true, true, true); grp->setLabel(QObject::tr("ATSC Caption Settings")); + if (settings) + grp->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + grp->getLabel()); // default text zoom 1.0 - grp->addChild(OSDCC708TextZoomPercentage()); + grp->addChild(OSDCC708TextZoomPercentage(settings)); // force X lines of captions // force caption character color @@ -1737,17 +1823,16 @@ // force background opacity // set default font type - grp->addChild(OSDCC708DefaultFontType()); + grp->addChild(OSDCC708DefaultFontType(settings)); return grp; } -static HostComboBox *OSDCC708Font( +static Configurable *OSDCC708Font( const QString &subtype, const QString &subtypeName, - const QString &subtypeNameForHelp) + const QString &subtypeNameForHelp, PlaySettings *settings) { - HostComboBox *gc = new HostComboBox( - QString("OSDCC708%1Font").arg(subtype)); + CREATE_COMBOBOX_SETTING(gc, QString("OSDCC708%1Font").arg(subtype), settings); gc->setLabel(subtypeName); QDir ttf(GetFontsDir(), GetFontsNameFilter()); @@ -1755,14 +1840,18 @@ gc->setHelpText( QObject::tr("ATSC %1 closed caption font.").arg(subtypeNameForHelp)); - return gc; + return wrap(gc, settings, (subtypeName.length() > 10)); } -static HorizontalConfigurationGroup *OSDCC708Fonts(void) +static HorizontalConfigurationGroup *OSDCC708Fonts(PlaySettings *settings) { HorizontalConfigurationGroup *grpmain = new HorizontalConfigurationGroup(false, true, true, true); grpmain->setLabel(QObject::tr("ATSC Caption Fonts")); + if (settings) + grpmain->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + grpmain->getLabel()); VerticalConfigurationGroup *col[] = { new VerticalConfigurationGroup(false, false, true, true), @@ -1798,7 +1887,8 @@ for (uint j = 0; j < 7; ++j) { col[i]->addChild(OSDCC708Font(subtypes[i].arg(types[j]), - typeNames[j], typeNames[j])); + typeNames[j], typeNames[j], + settings)); } grpmain->addChild(col[i]); @@ -1806,8 +1896,9 @@ for (uint j = 0; j < 7; ++j) { col[i]->addChild(OSDCC708Font( - subtypes[i].arg(types[j]), "", - QObject::tr("Italic") + ' ' + typeNames[j])); + subtypes[i].arg(types[j]), (settings ? typeNames[j] : ""), + QObject::tr("Italic") + ' ' + typeNames[j], + settings)); } grpmain->addChild(col[i]); @@ -1815,9 +1906,9 @@ return grpmain; } -static HostComboBox *SubtitleCodec() +static Configurable *SubtitleCodec(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("SubtitleCodec"); + CREATE_COMBOBOX_SETTING(gc, "SubtitleCodec", settings); gc->setLabel(QObject::tr("Subtitle Codec")); QList list = QTextCodec::availableCodecs(); @@ -1827,30 +1918,30 @@ gc->addSelection(val, val, val.toLower() == "utf-8"); } - return gc; + return wrap(gc, settings); } -static HorizontalConfigurationGroup *ExternalSubtitleSettings() +static HorizontalConfigurationGroup *ExternalSubtitleSettings(PlaySettings *settings) { HorizontalConfigurationGroup *grpmain = new HorizontalConfigurationGroup(false, true, true, true); grpmain->setLabel(QObject::tr("External Subtitle Settings")); - grpmain->addChild(SubtitleCodec()); + grpmain->addChild(SubtitleCodec(settings)); return grpmain; } -static HostComboBox *OSDThemeFontSizeType() +static Configurable *OSDThemeFontSizeType(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("OSDThemeFontSizeType"); + CREATE_COMBOBOX_SETTING(gc, "OSDThemeFontSizeType", settings); gc->setLabel(QObject::tr("Font size")); gc->addSelection(QObject::tr("default"), "default"); gc->addSelection(QObject::tr("small"), "small"); gc->addSelection(QObject::tr("big"), "big"); gc->setHelpText(QObject::tr("default: TV, small: monitor, big:")); - return gc; + return wrap(gc, settings); } static HostComboBox *ChannelOrdering() @@ -1862,44 +1953,44 @@ return gc; } -static HostSpinBox *VertScanPercentage() +static Configurable *VertScanPercentage(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("VertScanPercentage", -100, 100, 1); + CREATE_SPINBOX_SETTING(gs, "VertScanPercentage", settings, -100, 100, 1, false); gs->setLabel(QObject::tr("Vertical scaling")); gs->setValue(0); gs->setHelpText(QObject::tr( "Adjust this if the image does not fill your " "screen vertically. Range -100% to 100%")); - return gs; + return wrap(gs, settings); } -static HostSpinBox *HorizScanPercentage() +static Configurable *HorizScanPercentage(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("HorizScanPercentage", -100, 100, 1); + CREATE_SPINBOX_SETTING(gs, "HorizScanPercentage", settings, -100, 100, 1, false); gs->setLabel(QObject::tr("Horizontal scaling")); gs->setValue(0); gs->setHelpText(QObject::tr( "Adjust this if the image does not fill your " "screen horizontally. Range -100% to 100%")); - return gs; + return wrap(gs, settings); }; -static HostSpinBox *XScanDisplacement() +static Configurable *XScanDisplacement(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("XScanDisplacement", -50, 50, 1); + CREATE_SPINBOX_SETTING(gs, "XScanDisplacement", settings, -50, 50, 1, false); gs->setLabel(QObject::tr("Scan displacement (X)")); gs->setValue(0); gs->setHelpText(QObject::tr("Adjust this to move the image horizontally.")); - return gs; + return wrap(gs, settings); } -static HostSpinBox *YScanDisplacement() +static Configurable *YScanDisplacement(PlaySettings *settings) { - HostSpinBox *gs = new HostSpinBox("YScanDisplacement", -50, 50, 1); + CREATE_SPINBOX_SETTING(gs, "YScanDisplacement", settings, -50, 50, 1, false); gs->setLabel(QObject::tr("Scan displacement (Y)")); gs->setValue(0); gs->setHelpText(QObject::tr("Adjust this to move the image vertically.")); - return gs; + return wrap(gs, settings); }; static HostCheckBox *AlwaysStreamFiles() @@ -1915,31 +2006,31 @@ return gc; } -static HostCheckBox *UseVideoTimebase() +static Configurable *UseVideoTimebase(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("UseVideoTimebase"); + CREATE_CHECKBOX_SETTING(gc, "UseVideoTimebase", settings); gc->setLabel(QObject::tr("Use video as timebase")); gc->setValue(false); gc->setHelpText(QObject::tr("Use the video as the timebase and warp " "the audio to keep it in sync. (Experimental)")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *CCBackground() +static Configurable *CCBackground(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("CCBackground"); + CREATE_CHECKBOX_SETTING(gc, "CCBackground", settings); gc->setLabel(QObject::tr("Black background for closed captioning")); gc->setValue(false); gc->setHelpText(QObject::tr( "If enabled, captions will be displayed " "as white text over a black background " "for better contrast.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *DefaultCCMode() +static Configurable *DefaultCCMode(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("DefaultCCMode"); + CREATE_CHECKBOX_SETTING(gc, "DefaultCCMode", settings); gc->setLabel(QObject::tr("Always display closed captioning or subtitles")); gc->setValue(false); gc->setHelpText(QObject::tr( @@ -1947,12 +2038,12 @@ "when playing back recordings or watching " "live TV. Closed Captioning can be turned on or off " "by pressing \"T\" during playback.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *PreferCC708() +static Configurable *PreferCC708(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("Prefer708Captions"); + CREATE_CHECKBOX_SETTING(gc, "Prefer708Captions", settings); gc->setLabel(QObject::tr("Prefer EIA-708 over EIA-608 captions")); gc->setValue(true); gc->setHelpText( @@ -1960,36 +2051,36 @@ "When enabled the new EIA-708 captions will be preferred over " "the old EIA-608 captions in ATSC streams.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *EnableMHEG() +static Configurable *EnableMHEG(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("EnableMHEG"); + CREATE_CHECKBOX_SETTING(gc, "EnableMHEG", settings); gc->setLabel(QObject::tr("Enable Interactive TV")); gc->setValue(false); gc->setHelpText(QObject::tr( "If enabled, interactive TV applications (MHEG) will " "be activated. This is used for teletext and logos for " "radio and channels that are currently off-air.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *PersistentBrowseMode() +static Configurable *PersistentBrowseMode(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("PersistentBrowseMode"); + CREATE_CHECKBOX_SETTING(gc, "PersistentBrowseMode", settings); gc->setLabel(QObject::tr("Always use Browse mode in LiveTV")); gc->setValue(true); gc->setHelpText( QObject::tr( "If enabled, Browse mode will automatically be activated " "whenever you use Channel UP/DOWN while watching Live TV.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *BrowseAllTuners() +static Configurable *BrowseAllTuners(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("BrowseAllTuners"); + CREATE_CHECKBOX_SETTING(gc, "BrowseAllTuners", settings); gc->setLabel(QObject::tr("Browse all channels")); gc->setValue(false); gc->setHelpText( @@ -1997,24 +2088,24 @@ "If enabled, browse mode will shows channels on all " "available recording devices, instead of showing " "channels on just the current recorder.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *ClearSavedPosition() +static Configurable *ClearSavedPosition(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("ClearSavedPosition"); + CREATE_CHECKBOX_SETTING(gc, "ClearSavedPosition", settings); gc->setLabel(QObject::tr("Clear bookmark on playback")); gc->setValue(true); gc->setHelpText(QObject::tr("Automatically clear the bookmark on a " "recording when the recording is played back. If " "disabled, you can mark the beginning with rewind " "then save position.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *AltClearSavedPosition() +static Configurable *AltClearSavedPosition(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("AltClearSavedPosition"); + CREATE_CHECKBOX_SETTING(gc, "AltClearSavedPosition", settings); gc->setLabel(QObject::tr("Alternate clear and save bookmark")); gc->setValue(true); gc->setHelpText(QObject::tr("During playback the Select key " @@ -2022,38 +2113,38 @@ "Saved\" and \"Bookmark Cleared\". If disabled, the " "Select key will save the current position for each " "keypress.")); - return gc; + return wrap(gc, settings); } #if defined(USING_XV) || defined(USING_OPENGL_VIDEO) || defined(USING_VDPAU) -static HostCheckBox *UsePicControls() +static Configurable *UsePicControls(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("UseOutputPictureControls"); + CREATE_CHECKBOX_SETTING(gc, "UseOutputPictureControls", settings); gc->setLabel(QObject::tr("Enable picture controls")); gc->setValue(false); gc->setHelpText( QObject::tr( "If enabled, MythTV attempts to initialize picture controls " "(brightness, contrast, etc.) that are applied during playback.")); - return gc; + return wrap(gc, settings); } #endif -static HostLineEdit *UDPNotifyPort() +static Configurable *UDPNotifyPort(PlaySettings *settings) { - HostLineEdit *ge = new HostLineEdit("UDPNotifyPort"); + CREATE_LINEEDIT_SETTING(ge, "UDPNotifyPort", settings); ge->setLabel(QObject::tr("UDP Notify Port")); ge->setValue("6948"); ge->setHelpText(QObject::tr("During playback, MythTV will listen for " "connections from the \"mythtvosd\" or \"mythudprelay\" " "programs on this port. See the README in " "contrib/mythnotify/ for additional information.")); - return ge; + return wrap(ge, settings); } -static HostComboBox *PlaybackExitPrompt() +static Configurable *PlaybackExitPrompt(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("PlaybackExitPrompt"); + CREATE_COMBOBOX_SETTING(gc, "PlaybackExitPrompt", settings); gc->setLabel(QObject::tr("Action on playback exit")); gc->addSelection(QObject::tr("Just exit"), "0"); gc->addSelection(QObject::tr("Save position and exit"), "2"); @@ -2064,23 +2155,23 @@ "when you exit playback mode. The options available will " "allow you to save your position, delete the " "recording, or continue watching.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *EndOfRecordingExitPrompt() +static Configurable *EndOfRecordingExitPrompt(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("EndOfRecordingExitPrompt"); + CREATE_CHECKBOX_SETTING(gc, "EndOfRecordingExitPrompt", settings); gc->setLabel(QObject::tr("Prompt at end of recording")); gc->setValue(false); gc->setHelpText(QObject::tr("If set, a menu will be displayed allowing " "you to delete the recording when it has finished " "playing.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *JumpToProgramOSD() +static Configurable *JumpToProgramOSD(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("JumpToProgramOSD"); + CREATE_CHECKBOX_SETTING(gc, "JumpToProgramOSD", settings); gc->setLabel(QObject::tr("Jump to Program OSD")); gc->setValue(true); gc->setHelpText(QObject::tr( @@ -2089,12 +2180,12 @@ "'Watch Recording' screen when 'Jump to Program' " "is activated. If set, the recordings are shown " "in the OSD")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *ContinueEmbeddedTVPlay() +static Configurable *ContinueEmbeddedTVPlay(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("ContinueEmbeddedTVPlay"); + CREATE_CHECKBOX_SETTING(gc, "ContinueEmbeddedTVPlay", settings); gc->setLabel(QObject::tr("Continue Playback When Embedded")); gc->setValue(false); gc->setHelpText(QObject::tr( @@ -2102,12 +2193,12 @@ "is embedded in the upcoming program list or recorded " "list. The default is to pause the recorded show when " "embedded.")); - return gc; + return wrap(gc, settings); } -static HostCheckBox *AutomaticSetWatched() +static Configurable *AutomaticSetWatched(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("AutomaticSetWatched"); + CREATE_CHECKBOX_SETTING(gc, "AutomaticSetWatched", settings); gc->setLabel(QObject::tr("Automatically mark a recording as watched")); gc->setValue(false); gc->setHelpText(QObject::tr("If set, when you exit near the end of a " @@ -2115,7 +2206,7 @@ "detection is not foolproof, so do not enable this " "setting if you don't want an unwatched recording marked " "as watched.")); - return gc; + return wrap(gc, settings); } static HostSpinBox *LiveTVIdleTimeout() @@ -2380,9 +2471,9 @@ return gc; } -static HostComboBox *LetterboxingColour() +static Configurable *LetterboxingColour(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("LetterboxColour"); + CREATE_COMBOBOX_SETTING(gc, "LetterboxColour", settings); gc->setLabel(QObject::tr("Letterboxing Color")); for (int m = kLetterBoxColour_Black; m < kLetterBoxColour_END; ++m) gc->addSelection(toString((LetterBoxColour)m), QString::number(m)); @@ -2392,12 +2483,12 @@ "letterboxing, but those with plasma screens may prefer gray " "to minimize burn-in.") + " " + QObject::tr("Currently only works with XVideo video renderer.")); - return gc; + return wrap(gc, settings); } -static HostComboBox *AspectOverride() +static Configurable *AspectOverride(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("AspectOverride"); + CREATE_COMBOBOX_SETTING(gc, "AspectOverride", settings); gc->setLabel(QObject::tr("Video Aspect Override")); for (int m = kAspect_Off; m < kAspect_END; ++m) gc->addSelection(toString((AspectOverrideMode)m), QString::number(m)); @@ -2405,12 +2496,12 @@ "When enabled, these will override the aspect " "ratio specified by any broadcaster for all " "video streams.")); - return gc; + return wrap(gc, settings); } -static HostComboBox *AdjustFill() +static Configurable *AdjustFill(PlaySettings *settings) { - HostComboBox *gc = new HostComboBox("AdjustFill"); + CREATE_COMBOBOX_SETTING(gc, "AdjustFill", settings); gc->setLabel(QObject::tr("Zoom")); gc->addSelection(toString(kAdjustFill_AutoDetect_DefaultOff), QString::number(kAdjustFill_AutoDetect_DefaultOff)); @@ -2421,7 +2512,7 @@ gc->setHelpText(QObject::tr( "When enabled, these will apply a predefined " "zoom to all video playback in MythTV.")); - return gc; + return wrap(gc, settings); } // Theme settings @@ -3603,16 +3694,16 @@ return gs; } -static HostCheckBox *RealtimePriority() +static Configurable *RealtimePriority(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("RealtimePriority"); + CREATE_CHECKBOX_SETTING(gc, "RealtimePriority", settings); gc->setLabel(QObject::tr("Enable realtime priority threads")); gc->setHelpText(QObject::tr("When running mythfrontend with root " "privileges, some threads can be given enhanced priority. " "Disable this if mythfrontend freezes during video " "playback.")); gc->setValue(true); - return gc; + return wrap(gc, settings); } static HostCheckBox *EnableMediaMon() @@ -3768,16 +3859,16 @@ }; #ifdef USING_OPENGL_VSYNC -static HostCheckBox *UseOpenGLVSync() +static Configurable *UseOpenGLVSync(PlaySettings *settings) { - HostCheckBox *gc = new HostCheckBox("UseOpenGLVSync"); + CREATE_CHECKBOX_SETTING(gc, "UseOpenGLVSync", settings); gc->setLabel(QObject::tr("Enable OpenGL vertical sync for timing")); gc->setValue(false); gc->setHelpText(QObject::tr( "If it is supported by your hardware/drivers, " "MythTV will use OpenGL vertical syncing for " "video timing, reducing frame jitter.")); - return gc; + return wrap(gc, settings); } #endif @@ -4259,53 +4350,70 @@ addChild(remotecontrol); } -PlaybackSettings::PlaybackSettings() +PlaybackSettings::PlaybackSettings(PlaySettings *settings, + ConfigurationWizard *base) { uint i = 0, total = 8; #if CONFIG_DARWIN total += 2; #endif // USING_DARWIN + if (settings) + total -= 3; VerticalConfigurationGroup* general1 = new VerticalConfigurationGroup(false); general1->setLabel(QObject::tr("General Playback") + QString(" (%1/%2)").arg(++i).arg(total)); + if (settings) + general1->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + general1->getLabel()); HorizontalConfigurationGroup *columns = new HorizontalConfigurationGroup(false, false, true, true); VerticalConfigurationGroup *column1 = new VerticalConfigurationGroup(false, false, true, true); - column1->addChild(RealtimePriority()); - column1->addChild(DecodeExtraAudio()); - column1->addChild(UseVideoTimebase()); - column1->addChild(JumpToProgramOSD()); + if (!settings) + column1->addChild(RealtimePriority(settings)); + column1->addChild(DecodeExtraAudio(settings)); + column1->addChild(UseVideoTimebase(settings)); + column1->addChild(JumpToProgramOSD(settings)); columns->addChild(column1); VerticalConfigurationGroup *column2 = new VerticalConfigurationGroup(false, false, true, true); - column2->addChild(ClearSavedPosition()); - column2->addChild(AltClearSavedPosition()); - column2->addChild(AutomaticSetWatched()); - column2->addChild(ContinueEmbeddedTVPlay()); + column2->addChild(ClearSavedPosition(settings)); + column2->addChild(AltClearSavedPosition(settings)); + column2->addChild(AutomaticSetWatched(settings)); + column2->addChild(ContinueEmbeddedTVPlay(settings)); columns->addChild(column2); general1->addChild(columns); - general1->addChild(LiveTVIdleTimeout()); - general1->addChild(AlwaysStreamFiles()); + if (!settings) + general1->addChild(LiveTVIdleTimeout()); + if (!settings) + general1->addChild(AlwaysStreamFiles()); #ifdef USING_OPENGL_VSYNC - general1->addChild(UseOpenGLVSync()); + general1->addChild(UseOpenGLVSync(settings)); #endif // USING_OPENGL_VSYNC #if defined(USING_XV) || defined(USING_OPENGL_VIDEO) || defined(USING_VDPAU) - general1->addChild(UsePicControls()); + general1->addChild(UsePicControls(settings)); #endif // USING_XV - addChild(general1); + if (base) + base->addChild(general1); + else + addChild(general1); VerticalConfigurationGroup* general2 = new VerticalConfigurationGroup(false); general2->setLabel(QObject::tr("General Playback") + QString(" (%1/%2)").arg(++i).arg(total)); + if (settings) + general2->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + general2->getLabel()); HorizontalConfigurationGroup* oscan = new HorizontalConfigurationGroup(false, false, true, true); @@ -4313,29 +4421,37 @@ new VerticalConfigurationGroup(false, false, true, true); VerticalConfigurationGroup *ocol2 = new VerticalConfigurationGroup(false, false, true, true); - ocol1->addChild(VertScanPercentage()); - ocol1->addChild(YScanDisplacement()); - ocol2->addChild(HorizScanPercentage()); - ocol2->addChild(XScanDisplacement()); + ocol1->addChild(VertScanPercentage(settings)); + ocol1->addChild(YScanDisplacement(settings)); + ocol2->addChild(HorizScanPercentage(settings)); + ocol2->addChild(XScanDisplacement(settings)); oscan->addChild(ocol1); oscan->addChild(ocol2); HorizontalConfigurationGroup* aspect_fill = new HorizontalConfigurationGroup(false, false, true, true); - aspect_fill->addChild(AspectOverride()); - aspect_fill->addChild(AdjustFill()); + aspect_fill->addChild(AspectOverride(settings)); + aspect_fill->addChild(AdjustFill(settings)); general2->addChild(oscan); general2->addChild(aspect_fill); - general2->addChild(LetterboxingColour()); - general2->addChild(PIPLocationComboBox()); - general2->addChild(PlaybackExitPrompt()); - general2->addChild(EndOfRecordingExitPrompt()); - addChild(general2); + general2->addChild(LetterboxingColour(settings)); + general2->addChild(PIPLocationComboBox(settings)); + general2->addChild(PlaybackExitPrompt(settings)); + general2->addChild(EndOfRecordingExitPrompt(settings)); + if (base) + base->addChild(general2); + else + addChild(general2); QString tmp = QString(" (%1/%2)").arg(++i).arg(total); - addChild(new PlaybackProfileConfigs(tmp)); + if (base) + base->addChild(new PlaybackProfileConfigs(tmp, settings)); + else + addChild(new PlaybackProfileConfigs(tmp, settings)); + if (!settings) + { VerticalConfigurationGroup* pbox = new VerticalConfigurationGroup(false); pbox->setLabel(QObject::tr("View Recordings") + QString(" (%1/%2)").arg(++i).arg(total)); @@ -4364,39 +4480,73 @@ pbox3->addChild(DisplayGroupTitleSort()); pbox3->addChild(new WatchListSettings()); addChild(pbox3); + } VerticalConfigurationGroup* seek = new VerticalConfigurationGroup(false); seek->setLabel(QObject::tr("Seeking") + QString(" (%1/%2)").arg(++i).arg(total)); - seek->addChild(SmartForward()); - seek->addChild(FFRewReposTime()); - seek->addChild(FFRewReverse()); - seek->addChild(ExactSeeking()); - addChild(seek); + if (settings) + seek->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + seek->getLabel()); + seek->addChild(SmartForward(settings)); + seek->addChild(FFRewReposTime(settings)); + seek->addChild(FFRewReverse(settings)); + seek->addChild(ExactSeeking(settings)); + if (base) + base->addChild(seek); + else + addChild(seek); VerticalConfigurationGroup* comms = new VerticalConfigurationGroup(false); comms->setLabel(QObject::tr("Commercial Skip") + QString(" (%1/%2)").arg(++i).arg(total)); - comms->addChild(AutoCommercialSkip()); - comms->addChild(CommRewindAmount()); - comms->addChild(CommNotifyAmount()); + if (settings) + comms->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + comms->getLabel()); + comms->addChild(AutoCommercialSkip(settings)); + comms->addChild(CommRewindAmount(settings)); + comms->addChild(CommNotifyAmount(settings)); + if (!settings) // these are global settings, not host-specific + { comms->addChild(MaximumCommercialSkip()); comms->addChild(MergeShortCommBreaks()); comms->addChild(CommSkipAllBlanks()); - addChild(comms); + } + if (base) + base->addChild(comms); + else + addChild(comms); #if CONFIG_DARWIN VerticalConfigurationGroup* mac1 = new VerticalConfigurationGroup(false); mac1->setLabel(QObject::tr("Mac OS X video settings") + QString(" (%1/%2)").arg(++i).arg(total)); + if (settings) + mac1->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + mac1->getLabel()); + if (!settings) + { mac1->addChild(MacGammaCorrect()); mac1->addChild(MacScaleUp()); mac1->addChild(MacFullSkip()); - addChild(mac1); + } + if (base) + base->addChild(mac1); + else + addChild(mac1); VerticalConfigurationGroup* mac2 = new VerticalConfigurationGroup(false); mac2->setLabel(QObject::tr("Mac OS X video settings") + QString(" (%1/%2)").arg(++i).arg(total)); + if (settings) + mac2->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + mac2->getLabel()); + if (!setings) + { mac2->addChild(new MacMainSettings()); mac2->addChild(new MacFloatSettings()); @@ -4405,44 +4555,83 @@ row->addChild(new MacDockSettings()); row->addChild(new MacDesktopSettings()); mac2->addChild(row); + } - addChild(mac2); + if (base) + base->addChild(mac2); + else + addChild(mac2); #endif } -OSDSettings::OSDSettings() +OSDSettings::OSDSettings(PlaySettings *settings, + ConfigurationWizard *base) { VerticalConfigurationGroup* osd = new VerticalConfigurationGroup(false); osd->setLabel(QObject::tr("On-screen display")); + if (settings) + osd->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + osd->getLabel()); + if (!settings) osd->addChild(new ThemeSelector("OSDTheme")); - osd->addChild(OSDGeneralTimeout()); - osd->addChild(OSDProgramInfoTimeout()); - osd->addChild(OSDFont()); - osd->addChild(OSDThemeFontSizeType()); - osd->addChild(EnableMHEG()); - osd->addChild(PersistentBrowseMode()); - osd->addChild(BrowseAllTuners()); - addChild(osd); + osd->addChild(OSDGeneralTimeout(settings)); + osd->addChild(OSDProgramInfoTimeout(settings)); + osd->addChild(OSDFont(settings)); + osd->addChild(OSDThemeFontSizeType(settings)); + osd->addChild(EnableMHEG(settings)); + if (!settings) + { + osd->addChild(PersistentBrowseMode(settings)); + osd->addChild(BrowseAllTuners(settings)); + } + if (base) + base->addChild(osd); + else + addChild(osd); VerticalConfigurationGroup *udp = new VerticalConfigurationGroup(false); udp->setLabel(QObject::tr("UDP OSD Notifications")); - udp->addChild(OSDNotifyTimeout()); - udp->addChild(UDPNotifyPort()); - addChild(udp); + if (settings) + udp->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + udp->getLabel()); + udp->addChild(OSDNotifyTimeout(settings)); + udp->addChild(UDPNotifyPort(settings)); + if (base) + base->addChild(udp); + else + addChild(udp); VerticalConfigurationGroup *cc = new VerticalConfigurationGroup(false); cc->setLabel(QObject::tr("Analog Closed Captions")); - cc->addChild(OSDCCFont()); + if (settings) + cc->setLabel(QObject::tr("Playback group settings for ") + + settings->mGroupName + " - " + + cc->getLabel()); + cc->addChild(OSDCCFont(settings)); //cc->addChild(DecodeVBIFormat()); - cc->addChild(CCBackground()); - cc->addChild(DefaultCCMode()); - cc->addChild(PreferCC708()); - addChild(cc); + cc->addChild(CCBackground(settings)); + cc->addChild(DefaultCCMode(settings)); + cc->addChild(PreferCC708(settings)); + if (base) + base->addChild(cc); + else + addChild(cc); - addChild(OSDCC708Settings()); - addChild(OSDCC708Fonts()); - addChild(ExternalSubtitleSettings()); + if (base) + { + base->addChild(OSDCC708Settings(settings)); + base->addChild(OSDCC708Fonts(settings)); + base->addChild(ExternalSubtitleSettings(settings)); + } + else + { + addChild(OSDCC708Settings(settings)); + addChild(OSDCC708Fonts(settings)); + addChild(ExternalSubtitleSettings(settings)); + } #if CONFIG_DARWIN // Any Mac OS-specific OSD stuff would go here. Index: programs/mythfrontend/main.cpp =================================================================== --- programs/mythfrontend/main.cpp (revision 23571) +++ programs/mythfrontend/main.cpp (working copy) @@ -34,6 +34,7 @@ #include "globalsettings.h" #include "profilegroup.h" #include "playgroup.h" +#include "playsettings.h" #include "networkcontrol.h" #include "DVDRingBuffer.h" #include "scheduledrecording.h" @@ -485,6 +486,16 @@ delete statusbox; } +ConfigurationWizard *createPlaybackSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) +{ + return new PlaybackSettings(settings, base); +} + +ConfigurationWizard *createOSDSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base) +{ + return new OSDSettings(settings, base); +} + void TVMenuCallback(void *data, QString &selection) { (void)data; @@ -577,7 +588,8 @@ } else if (sel == "settings playgroup") { - PlayGroupEditor editor; + PlayGroupEditor editor(createPlaybackSettingsForPlaybackGroup, + createOSDSettingsForPlaybackGroup); editor.exec(); } else if (sel == "settings general") Index: programs/mythfrontend/globalsettings.h =================================================================== --- programs/mythfrontend/globalsettings.h (revision 23571) +++ programs/mythfrontend/globalsettings.h (working copy) @@ -10,6 +10,7 @@ #include "themeinfo.h" class QFileInfo; +class PlaySettings; class ThemeSelector : public HostImageSelect { @@ -23,13 +24,15 @@ class PlaybackSettings : public ConfigurationWizard { public: - PlaybackSettings(); + PlaybackSettings(PlaySettings *settings=NULL, + ConfigurationWizard *base=NULL); }; class OSDSettings: virtual public ConfigurationWizard { public: - OSDSettings(); + OSDSettings(PlaySettings *settings=NULL, + ConfigurationWizard *base=NULL); }; class GeneralSettings : public ConfigurationWizard @@ -140,7 +143,7 @@ Q_OBJECT public: - PlaybackProfileConfigs(const QString &str); + PlaybackProfileConfigs(const QString &str, PlaySettings *settings); virtual ~PlaybackProfileConfigs(); private: @@ -152,7 +155,7 @@ private: QStringList profiles; - HostComboBox *grouptrigger; + ComboBoxSetting *grouptrigger; }; #endif Index: programs/mythavtest/main.cpp =================================================================== --- programs/mythavtest/main.cpp (revision 23571) +++ programs/mythavtest/main.cpp (working copy) @@ -22,6 +22,7 @@ #include "dbcheck.h" #include "myththemebase.h" #include "audiopulseutil.h" +#include "playsettings.h" static void *run_priv_thread(void *data) @@ -215,13 +216,6 @@ return GENERIC_EXIT_DB_OUTOFDATE; } - TV *tv = new TV(); - if (!tv->Init()) - { - VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initialize TV class."); - return TV_EXIT_NO_TV; - } - ProgramInfo *pginfo = NULL; if (!filename.isEmpty() && @@ -240,6 +234,14 @@ } + PlaySettings settings(pginfo->playgroup); + TV *tv = new TV(&settings); + if (!tv->Init()) + { + VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initialize TV class."); + return TV_EXIT_NO_TV; + } + TV::StartTV(pginfo, false); if (pginfo)