Ticket #8088: 8088_playgroups_v21.patch

mythtv/libs/libmyth/libmyth.pro

@@ -65 +65 @@
 SOURCES += mythrssmanager.cpp     netgrabbermanager.cpp
 SOURCES += rssparse.cpp           netutils.cpp
 
+HEADERS += playsettings.h
+SOURCES += playsettings.cpp
+
 # remove when everything is switched to mythui
 SOURCES += virtualkeyboard_qt.cpp
 

mythtv/libs/libmyth/mythconfiggroups.cpp

@@ -476 +476 @@
                                             Configurable *target)
 {
     VerifyLayout();
+    bool isDuplicate = triggerMap.values().contains(target);
     triggerMap[triggerValue] = target;
 
     if (!configStack)
@@ -485 +486 @@
         configStack->setSaveAll(isSaveAll);
     }
 
-    configStack->addChild(target);
+    // Don't add a target as a child if it has already been added,
+    // otherwise something goes wrong with signals in the child.
+    if (!isDuplicate)
+        configStack->addChild(target);
 }
 
 Setting *TriggeredConfigurationGroup::byName(const QString &settingName)

mythtv/libs/libmyth/mythwidgets.cpp

@@ -223 +223 @@
         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;
     }

mythtv/libs/libmyth/mythwidgets.h

@@ -329 +329 @@
     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&);
 

mythtv/libs/libmyth/settings.cpp

@@ -235 +235 @@
     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);
@@ -299 +313 @@
         QLabel *label = new QLabel();
         label->setText(getLabel() + ":     ");
         layout->addWidget(label);
+        labelWidget = label;
     }
 
     bxwidget = widget;
@@ -327 +342 @@
 
     widget->setLayout(layout);
 
+    setValue(getValue());
+
     return widget;
 }
 
@@ -336 +353 @@
     {
         bxwidget = NULL;
         edit     = NULL;
+        labelWidget = NULL;
     }
 }
 
@@ -373 +391 @@
     Setting::setHelpText(str);
 }
 
+static void adjustFont(QWidget *widget, bool isDefault)
+{
+    if (widget)
+    {
+        QFont f = widget->font();
+        f.setWeight(isDefault ? QFont::Light : QFont::Bold);
+        widget->setFont(f);
+    }
+}
+
+void LineEditSetting::setValue(const QString &newValue)
+{
+    if (adjustOnBlank)
+    {
+        adjustFont(labelWidget, newValue.isEmpty());
+        adjustFont(edit,        newValue.isEmpty());
+    }
+    Setting::setValue(newValue);
+}
+
 void BoundedIntegerSetting::setValue(int newValue)
 {
     newValue = std::max(std::min(newValue, max), min);
@@ -439 +477 @@
 
 SpinBoxSetting::SpinBoxSetting(
     Storage *_storage, int _min, int _max, int _step, 
-    bool _allow_single_step, QString _special_value_text) :
+    bool _allow_single_step, QString _special_value_text,
+    bool change_style_on_special) :
     BoundedIntegerSetting(_storage, _min, _max, _step),
     spinbox(NULL), relayEnabled(true),
-    sstep(_allow_single_step), svtext("")
+    sstep(_allow_single_step), svtext(""), labelWidget(NULL),
+    changeOnSpecial(change_style_on_special)
 {
     if (!_special_value_text.isEmpty())
         svtext = _special_value_text;
@@ -476 +516 @@
         QLabel *label = new QLabel();
         label->setText(getLabel() + ":     ");
         layout->addWidget(label);
+        labelWidget = label;
     }
 
     bxwidget = widget;
@@ -506 +547 @@
 
     widget->setLayout(layout);
 
+    setValue(intValue());
+
     return widget;
 }
 
@@ -515 +558 @@
     {
         bxwidget = NULL;
         spinbox  = NULL;
+        labelWidget = NULL;
     }
 }
 
 void SpinBoxSetting::setValue(int newValue)
 {
     newValue = std::max(std::min(newValue, max), min);
+    if (changeOnSpecial)
+    {
+        adjustFont(labelWidget, (newValue == min));
+        adjustFont(spinbox,     (newValue == min));
+    }
     if (spinbox && (spinbox->value() != newValue))
     {
         //int old = intValue();
@@ -631 +680 @@
         QLabel *label = new QLabel();
         label->setText(getLabel() + ":     ");
         layout->addWidget(label);
+        labelWidget = label;
     }
 
     bxwidget = widget;
@@ -659 +709 @@
             cbwidget, SLOT(clear()));
 
     if (rw)
+    {
         connect(cbwidget, SIGNAL(editTextChanged(const QString &)),
                 this, SLOT(editTextChanged(const QString &)));
+        connect(cbwidget, SIGNAL(editTextChanged(const QString &)),
+                this, SLOT(changeLabel(const QString &)));
+    }
 
     if (cg)
         connect(cbwidget, SIGNAL(changeHelpText(QString)), cg,
@@ -673 +727 @@
 
     widget->setLayout(layout);
 
+    setValue(current);
+
     return widget;
 }
 
@@ -682 +738 @@
     {
         bxwidget = NULL;
         cbwidget = NULL;
+        labelWidget = NULL;
     }
 }
 
@@ -717 +774 @@
 
     if (rw)
     {
+        changeLabel(newValue);
         Setting::setValue(newValue);
         if (cbwidget)
             cbwidget->setCurrentIndex(current);
@@ -727 +785 @@
 {
     if (cbwidget)
         cbwidget->setCurrentIndex(which);
+    changeLabel(labels[which]);
     SelectSetting::setValue(which);
 }
 
-void ComboBoxSetting::addSelection(
-    const QString &label, QString value, bool select)
+void ComboBoxSetting::changeLabel(const QString &newLabel)
+{
+    if (changeOnSpecial)
+    {
+        adjustFont(labelWidget, specialLabel == newLabel);
+        adjustFont(cbwidget,    specialLabel == newLabel);
+    }
+}
+
+void ComboBoxSetting::addSelection(const QString &label, QString value,
+                                   bool select, bool special_formatting)
 {
     if ((findSelection(label, value) < 0) && cbwidget)
     {
@@ -739 +807 @@
         cbwidget->insertItem(label);
     }
 
+    if (special_formatting)
+    {
+        changeOnSpecial = true;
+        specialLabel = label;
+    }
+
     SelectSetting::addSelection(label, value, select);
 
     if (cbwidget && isSet)
@@ -955 +1029 @@
     BooleanSetting::setHelpText(str);
 }
 
+QWidget* TristateCheckBoxSetting::configWidget(ConfigurationGroup *cg,
+                                               QWidget* parent,
+                                               const char* widgetName) {
+    widget = new MythCheckBox(parent, widgetName, true);
+    connect(widget, SIGNAL(destroyed(QObject*)),
+            this,   SLOT(widgetDeleted(QObject*)));
+
+    widget->setHelpText(getHelpText());
+    widget->setText(getLabel());
+    widget->setCheckState(tristateValue());
+    setValue(tristateValue());
+
+    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,
+                SIGNAL(changeHelpText(QString)));
+
+    return widget;
+}
+
+void TristateCheckBoxSetting::widgetInvalid(QObject *obj)
+{
+    widget = (widget == obj) ? NULL : widget;
+}
+
+void TristateCheckBoxSetting::setEnabled(bool fEnabled)
+{
+    TristateSetting::setEnabled(fEnabled);
+    if (widget)
+        widget->setEnabled(fEnabled);
+}
+
+void TristateCheckBoxSetting::setHelpText(const QString &str)
+{
+    if (widget)
+        widget->setHelpText(str);
+    TristateSetting::setHelpText(str);
+}
+
+const char *TristateSetting::kPartiallyCheckedString = "default";
+
+void TristateCheckBoxSetting::setValue(int check)
+{
+    adjustFont(widget, (check != Qt::Checked && check != Qt::Unchecked));
+    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) 
@@ -1142 +1279 @@
     addSelection(label, value, select);
 }
 
+void ImageSelectSetting::addDefaultSelection(const QString label,
+                                             const QString value,
+                                             const QString defaultValue,
+                                             bool select)
+{
+    for (unsigned i=0; i<values.size(); i++)
+    {
+        if (values[i] == defaultValue)
+        {
+            changeOnSpecial = true;
+            specialLabel = label;
+            images.push_back(new QImage(*images[i]));
+            addSelection(label, value, select);
+            return;
+        }
+    }
+}
+
 ImageSelectSetting::~ImageSelectSetting()
 {
     Teardown();
@@ -1164 +1319 @@
     bxwidget   = NULL;
     imagelabel = NULL;
     combo      = NULL;
+    labelWidget = NULL;
 }
 
 void ImageSelectSetting::imageSet(int num)
@@ -1211 +1367 @@
         QLabel *label = new QLabel();
         label->setText(getLabel() + ":");
         layout->addWidget(label);
+        labelWidget = label;
     }
 
     combo = new MythComboBox(false);
@@ -1257 +1414 @@
     connect(combo, SIGNAL(highlighted(int)), this, SLOT(imageSet(int)));
     connect(combo, SIGNAL(activated(int)), this, SLOT(setValue(int)));
     connect(combo, SIGNAL(activated(int)), this, SLOT(imageSet(int)));
+    connect(combo, SIGNAL(highlighted(const QString &)),
+            this, SLOT(changeLabel(const QString &)));
+    connect(combo, SIGNAL(activated(const QString &)),
+            this, SLOT(changeLabel(const QString &)));
 
     connect(this, SIGNAL(selectionsCleared()),
             combo, SLOT(clear()));
@@ -1267 +1428 @@
 
     bxwidget->setLayout(layout);
 
+    changeLabel(GetLabel(current));
+
     return bxwidget;
 }
 
+void ImageSelectSetting::changeLabel(const QString &newLabel)
+{
+    if (changeOnSpecial)
+    {
+        adjustFont(labelWidget, specialLabel == newLabel);
+        adjustFont(combo,       specialLabel == newLabel);
+    }
+}
+
 void ImageSelectSetting::widgetInvalid(QObject *obj)
 {
     if (bxwidget == obj)

mythtv/libs/libmyth/settings.h

@@ -134 +134 @@
 
 class MPUBLIC LineEditSetting : public Setting
 {
+    Q_OBJECT
+
   protected:
-    LineEditSetting(Storage *_storage, bool readwrite = true) :
+    LineEditSetting(Storage *_storage, bool readwrite = true,
+                    bool adjust_on_blank = false) :
         Setting(_storage), bxwidget(NULL), edit(NULL),
-        rw(readwrite), password_echo(false) { }
+        rw(readwrite), password_echo(false),
+        adjustOnBlank(adjust_on_blank), labelWidget(NULL) { }
 
   public:
     virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, 
@@ -159 +163 @@
 
     virtual void setHelpText(const QString &str);
 
+  public slots:
+    virtual void setValue(const QString &newValue);
+
   private:
     QWidget      *bxwidget;
     MythLineEdit *edit;
     bool rw;
     bool password_echo;
+    bool adjustOnBlank;
+    QWidget *labelWidget;
 };
 
 // TODO: set things up so that setting the value as a string emits
@@ -219 +228 @@
   public:
     SpinBoxSetting(Storage *_storage, int min, int max, int step, 
                    bool allow_single_step = false,
-                   QString special_value_text = "");
+                   QString special_value_text = "",
+                   bool change_style_on_special = false);
 
     virtual QWidget *configWidget(ConfigurationGroup *cg, QWidget *parent, 
                                   const char *widgetName = 0);
@@ -248 +258 @@
     bool         relayEnabled;
     bool         sstep;
     QString      svtext;
+    QLabel      *labelWidget;
+    bool         changeOnSpecial;
 };
 
 class MPUBLIC SelectSetting : public Setting
@@ -277 +289 @@
         { return (i < labels.size()) ? labels[i] : QString::null; }
     virtual QString GetValue(uint i) const
         { return (i < values.size()) ? values[i] : QString::null; }
+    virtual QString GetValueLabel(const QString &value);
 
 signals:
     void selectionAdded(const QString& label, QString value);
@@ -318 +331 @@
 protected:
     ComboBoxSetting(Storage *_storage, bool _rw = false, int _step = 1) :
         SelectSetting(_storage), rw(_rw),
-        bxwidget(NULL), cbwidget(NULL), step(_step) { }
+        bxwidget(NULL), cbwidget(NULL), changeOnSpecial(false),
+        specialLabel(""), labelWidget(NULL), step(_step) { }
 
 public:
     virtual void setValue(QString newValue);
@@ -340 +354 @@
 public slots:
     void addSelection(const QString &label,
                       QString value = QString::null,
-                      bool select = false);
+                      bool select = false,
+                      bool special_formatting = false);
     bool removeSelection(const QString &label,
                          QString value = QString::null);
+    virtual void changeLabel(const QString &newValue);
     void editTextChanged(const QString &newText);
 
 private:
     bool rw;
     QWidget      *bxwidget;
     MythComboBox *cbwidget;
+    bool          changeOnSpecial;
+    QString       specialLabel;
+    QLabel       *labelWidget;
 
 protected:
     int step;
@@ -417 +436 @@
     ImageSelectSetting(Storage *_storage) :
         SelectSetting(_storage),
         bxwidget(NULL), imagelabel(NULL), combo(NULL),
-        m_hmult(1.0f), m_wmult(1.0f) { }
+        m_hmult(1.0f), m_wmult(1.0f),
+        changeOnSpecial(false), specialLabel(""), labelWidget(NULL) { }
     virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent, 
                                   const char* widgetName = 0);
     virtual void widgetInvalid(QObject *obj);
@@ -428 +448 @@
                                    QImage* image,
                                    QString value=QString::null,
                                    bool select=false);
+    virtual void addDefaultSelection(const QString label,
+                                     const QString value,
+                                     const QString defaultValue,
+                                     bool select);
 
 protected slots:
     void imageSet(int);
+    void changeLabel(const QString &newLabel);
 
   protected:
     void Teardown(void);
@@ -442 +467 @@
     QLabel *imagelabel;
     MythComboBox *combo;
     float m_hmult, m_wmult;
+    bool          changeOnSpecial;
+    QString       specialLabel;
+    QLabel       *labelWidget;
 };
 
 class MPUBLIC BooleanSetting : public Setting
@@ -484 +512 @@
     MythCheckBox *widget;
 };
 
+class MPUBLIC TristateSetting : public BooleanSetting
+{
+    Q_OBJECT
+
+  public:
+    TristateSetting(Storage *_storage) : BooleanSetting(_storage) {}
+
+    Qt::CheckState tristateValue(void) const {
+        if (getValue() == "0")
+            return Qt::Unchecked;
+        if (getValue() == "1")
+            return Qt::Checked;
+        return Qt::PartiallyChecked;
+    }
+
+    static const char *kPartiallyCheckedString;
+
+public slots:
+    virtual void setValue(/*Qt::CheckState*/int check);
+
+signals:
+    void valueChanged(int);
+};
+
+class MPUBLIC TristateCheckBoxSetting: public TristateSetting {
+    Q_OBJECT
+
+public:
+    TristateCheckBoxSetting(Storage *_storage) :
+        TristateSetting(_storage), widget(NULL) { }
+    virtual QWidget* configWidget(ConfigurationGroup *cg, QWidget* parent,
+                                  const char* widgetName = 0);
+    virtual void widgetInvalid(QObject*);
+
+    virtual void setEnabled(bool b);
+
+    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;
+};
+
 class MPUBLIC PathSetting : public ComboBoxSetting
 {
 public:

mythtv/libs/libmythtv/DetectLetterbox.cpp

@@ -5 +5 @@
 #include "mythplayer.h"
 #include "videoouttypes.h"
 #include "mythcorecontext.h"
+#include "playsettings.h"
 
 DetectLetterbox::DetectLetterbox(MythPlayer* const player)
 {
-    int dbAdjustFill = gCoreContext->GetNumSetting("AdjustFill", 0);
+    int dbAdjustFill = player->GetPlaySettings()->GetNumSetting("AdjustFill", 0);
     isDetectLetterbox = dbAdjustFill >= kAdjustFill_AutoDetect_DefaultOff;
     firstFrameChecked = 0;
     detectLetterboxDefaultMode = (AdjustFillMode) max((int) kAdjustFill_Off,
@@ -18 +19 @@
     detectLetterboxPossibleFullFrame = -1;
     detectLetterboxConsecutiveCounter = 0;
     detectLetterboxDetectedMode = player->GetAdjustFill();
-    detectLetterboxLimit = gCoreContext->GetNumSetting("DetectLeterboxLimit", 75);
+    detectLetterboxLimit =
+        player->GetPlaySettings()->GetNumSetting("DetectLeterboxLimit", 75);
     m_player = player;
 }
 

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -35 +35 @@
 #include "bdringbuffer.h"
 #include "videodisplayprofile.h"
 #include "mythuihelper.h"
+#include "playsettings.h"
 
 #include "lcddevice.h"
 
@@ -284 +285 @@
 
     cc608_build_parity_table(cc608_parity_table);
 
-    if (gCoreContext->GetNumSetting("CCBackground", 0))
+    if (GetPlayer()->GetPlaySettings()->GetNumSetting("CCBackground", 0))
         CC708Window::forceWhiteOnBlackText = true;
 
     no_dts_hack = false;
@@ -1181 +1182 @@
     if (selectedStream)
     {
         directrendering = true;
-        if (!gCoreContext->GetNumSetting("DecodeExtraAudio", 0) &&
+        if (!GetPlayer()->GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0) &&
             !CODEC_IS_HWACCEL(codec, enc))
         {
             SetLowBuffers(false);
@@ -1686 +1687 @@
 
                 if (!is_db_ignored)
                 {
-                    VideoDisplayProfile vdp;
+                    VideoDisplayProfile vdp(GetPlayer()->GetPlaySettings());
                     vdp.SetInput(QSize(width, height));
                     dec = vdp.GetDecoder();
                     thread_count = vdp.GetMaxCPUs();
@@ -1714 +1715 @@
                     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,
+                        GetPlayer()->GetPlaySettings());
 
                     if (vdpau_mcid >= video_codec_id)
                     {

mythtv/libs/libmythtv/dbcheck.cpp

@@ -3558 +3558 @@
 
             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--"))
@@ -5994 +5995 @@
 "  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',"

mythtv/libs/libmythtv/mythplayer.cpp

@@ -60 +60 @@
 #include "mythpainter.h"
 #include "mythimage.h"
 #include "mythuiimage.h"
+#include "playsettings.h"
 
 extern "C" {
 #include "vbitext/vbi.h"
@@ -249 +250 @@
       output_jmeter(NULL)
 {
     playerThread = QThread::currentThread();
-    // Playback (output) zoom control
-    detect_letter_box = new DetectLetterbox(this);
-
-    vbimode = VBIMode::Parse(gCoreContext->GetSetting("VbiFormat"));
-    decode_extra_audio = gCoreContext->GetNumSetting("DecodeExtraAudio", 0);
-    itvEnabled         = gCoreContext->GetNumSetting("EnableMHEG", 0);
-    db_prefer708       = gCoreContext->GetNumSetting("Prefer708Captions", 1);
 
     bzero(&tc_lastval, sizeof(tc_lastval));
     bzero(&tc_wrap,    sizeof(tc_wrap));
@@ -495 +489 @@
     if (using_null_videoout && decoder)
     {
         MythCodecID codec = decoder->GetVideoCodecID();
-        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, codec, 0))
         {
@@ -545 +539 @@
                 pipState,
                 video_disp_dim, video_aspect,
                 widget->winId(), display_rect, (video_frame_rate * play_speed),
-                0 /*embedid*/);
+                0 /*embedid*/, GetPlaySettings());
         }
 
         if (videoOutput)
@@ -636 +630 @@
 
 void MythPlayer::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."));
@@ -2039 +2033 @@
         }
 #endif // USING_MHEG
 
-        SetCaptionsEnabled(gCoreContext->GetNumSetting("DefaultCCMode"), false);
+        SetCaptionsEnabled(GetPlaySettings()->GetNumSetting("DefaultCCMode", 0),
+                           false);
         osdLock.unlock();
     }
 
@@ -2086 +2081 @@
         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)
@@ -2469 +2465 @@
     if (bookmarkseek > 30)
     {
         DoFastForward(bookmarkseek, true, false);
-        if (gCoreContext->GetNumSetting("ClearSavedPosition", 1) &&
+        if (GetPlaySettings()->GetNumSetting("ClearSavedPosition", 1) &&
             !player_ctx->IsPIP())
         {
             ClearBookmark(false);
@@ -2697 +2693 @@
     {
         if (jumpto == totalFrames)
         {
-            if (!(gCoreContext->GetNumSetting("EndOfRecordingExitPrompt") == 1
+            if (!(GetPlaySettings()->GetNumSetting("EndOfRecordingExitPrompt", 0) == 1
                   && !player_ctx->IsPIP() &&
                   player_ctx->GetState() == kState_WatchingPreRecorded))
             {
@@ -2980 +2976 @@
         return kPIP_END;
 
     if (pip_players.isEmpty())
-        return (PIPLocation)gCoreContext->GetNumSetting("PIPLocation", kPIPTopLeft);
+        return (PIPLocation)GetPlaySettings()->GetNumSetting("PIPLocation",
+                                                             kPIPTopLeft);
 
     // order of preference, could be stored in db if we want it configurable
     PIPLocation ols[] =
@@ -3488 +3485 @@
     exactseeks   = frame_exact_seek;
     player_ctx   = ctx;
     livetv       = ctx->tvchain;
+
+    vbimode = VBIMode::Parse(GetPlaySettings()->GetSetting("VbiFormat", ""));
+
+    // Playback (output) zoom control
+    detect_letter_box = new DetectLetterbox(this);
+
+    decode_extra_audio = GetPlaySettings()->GetNumSetting("DecodeExtraAudio", 0);
+    itvEnabled = GetPlaySettings()->GetNumSetting("EnableMHEG", 0);
+    db_prefer708 = GetPlaySettings()->GetNumSetting("Prefer708Captions", 1);
 }
 
 bool MythPlayer::EnableEdit(void)

mythtv/libs/libmythtv/mythplayer.h

@@ -186 +186 @@
     QString   GetXDS(const QString &key) 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; }

mythtv/libs/libmythtv/playercontext.cpp

@@ -16 +16 @@
 #include "storagegroup.h"
 #include "mythcorecontext.h"
 #include "videometadatautil.h"
+#include "DetectLetterbox.h"
+#include "playsettings.h"
 
 #define LOC QString("playCtx: ")
 #define LOC_ERR QString("playCtx, Error: ")
@@ -405 +407 @@
                                  WId embedwinid, const QRect *embedbounds,
                                  bool muted)
 {
-    int exact_seeking = gCoreContext->GetNumSetting("ExactSeeking", 0);
+    int exact_seeking = settings->GetNumSetting("ExactSeeking", 0);
 
     if (HasPlayer())
     {
@@ -448 +450 @@
     {
         QString subfn = buffer->GetSubtitleFilename();
         if (!subfn.isEmpty() && player->GetSubReader())
-            player->GetSubReader()->LoadExternalSubtitles(subfn);
+            player->GetSubReader()->LoadExternalSubtitles(subfn, settings);
     }
 
     if ((embedwinid > 0) && embedbounds)
@@ -915 +917 @@
 /**
  * \brief assign programinfo to the context
  */
-void PlayerContext::SetPlayingInfo(const ProgramInfo *info)
+void PlayerContext::SetPlayingInfo(const ProgramInfo *info,
+                                   PlaySettings *_settings)
 {
     bool ignoreDB = gCoreContext->IsDatabaseIgnored();
 
@@ -927 +930 @@
             playingInfo->MarkAsInUse(false, recUsage);
         delete playingInfo;
         playingInfo = NULL;
+        // XXX delete settings?
     }
 
     if (info)
@@ -935 +939 @@
         if (!ignoreDB)
             playingInfo->MarkAsInUse(true, recUsage);
         playingLen = playingInfo->GetSecondsInRecording();
+        settings = (_settings ? _settings :
+                    new PlaySettings(playingInfo->GetPlaybackGroup()));
     }
 }
 

mythtv/libs/libmythtv/playercontext.h

@@ -28 +28 @@
 class LiveTVChain;
 class MythDialog;
 class QPainter;
+class PlaySettings;
 
 struct osdInfo
 {
@@ -115 +116 @@
     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; }
@@ -173 +174 @@
     LiveTVChain        *tvchain;
     RingBuffer         *buffer;
     ProgramInfo        *playingInfo; ///< Currently playing info
+    PlaySettings       *settings; // corresponding to playingInfo
     long long           playingLen;  ///< Initial CalculateLength()
     AVSpecialDecode     specialDecode;
     bool                nohardwaredecoders; // < Disable use of VDPAU decoding

mythtv/libs/libmythtv/playgroup.cpp

@@ -2 +2 @@
 #include "playgroup.h"
 #include "programinfo.h"
 #include "mythwidgets.h"
+#include "playsettings.h"
 
 class PlayGroupConfig: public ConfigurationWizard
 {
@@ -220 +221 @@
     return res;
 }
 
-PlayGroupEditor::PlayGroupEditor(void) :
-    listbox(new ListBoxSetting(this)), lastValue("Default")
+PlayGroupEditor::PlayGroupEditor(SettingsLookup *funcArray, int funcArraySize) :
+    listbox(new ListBoxSetting(this)), lastValue("Default"),
+    getSettings(funcArray), getSettingsSize(funcArraySize)
 {
     listbox->setLabel(tr("Playback Groups"));
     addChild(listbox);
@@ -252 +254 @@
     }
 
     PlayGroupConfig group(name);
+    PlaySettings *psettings = new PlaySettings(name);
+    for (int i=0; i<getSettingsSize; i++)
+        getSettings[i](psettings, &group);
     if (group.exec() == QDialog::Accepted || !created)
         lastValue = name;
     else
@@ -286 +291 @@
         query.bindValue(":NAME", name);
         if (!query.exec())
             MythDB::DBError("PlayGroupEditor::doDelete", query);
+        PlaySettings::deleteGroup(name);
 
         int lastIndex = listbox->getValueIndex(name);
         lastValue = "";

mythtv/libs/libmythtv/playgroup.h

@@ -6 +6 @@
 #include "settings.h"
 
 class ProgramInfo;
+class PlaySettings;
 
 class MPUBLIC PlayGroup
 {
@@ -22 +23 @@
     Q_OBJECT
 
   public:
-    PlayGroupEditor(void);
+    typedef ConfigurationWizard *(*SettingsLookup)(PlaySettings *settings,
+                                                   ConfigurationWizard *base);
+    PlayGroupEditor(SettingsLookup *funcArray, int funcArraySize);
     virtual DialogCode exec(void);
     virtual void Load(void);
     virtual void Save(void) { }
@@ -37 +40 @@
   protected:
     ListBoxSetting *listbox;
     QString         lastValue;
+    SettingsLookup *getSettings;
+    int             getSettingsSize;
 };
 
 #endif

mythtv/libs/libmythtv/subtitlereader.cpp

@@ -65 +65 @@
         av_free(subtitle.rects);
 }
 
-bool SubtitleReader::LoadExternalSubtitles(const QString &subtitleFileName)
+bool SubtitleReader::LoadExternalSubtitles(const QString &subtitleFileName,
+                                           PlaySettings *settings)
 {
     m_TextSubtitles.Clear();
-    return TextSubtitleParser::LoadSubtitles(subtitleFileName, m_TextSubtitles);
+    return TextSubtitleParser::LoadSubtitles(subtitleFileName, m_TextSubtitles,
+                                             settings);
 }
 
 bool SubtitleReader::HasTextSubtitles(void)

mythtv/libs/libmythtv/subtitlereader.h

@@ -44 +44 @@
 
     TextSubtitles* GetTextSubtitles(void) { return &m_TextSubtitles; }
     bool HasTextSubtitles(void);
-    bool LoadExternalSubtitles(const QString &videoFile);
+    bool LoadExternalSubtitles(const QString &videoFile, PlaySettings *settings);
 
     QStringList GetRawTextSubtitles(uint64_t &duration);
     void AddRawTextSubtitle(QStringList list, uint64_t duration);

mythtv/libs/libmythtv/subtitlescreen.cpp

@@ -7 +7 @@
 #include "mythuiimage.h"
 #include "mythpainter.h"
 #include "subtitlescreen.h"
+#include "playsettings.h"
 
 #define LOC      QString("Subtitles: ")
 #define LOC_WARN QString("Subtitles Warning: ")
@@ -68 +69 @@
         VERBOSE(VB_IMPORTANT, LOC_WARN + "Failed to get CEA-608 reader.");
     if (!m_708reader)
         VERBOSE(VB_IMPORTANT, LOC_WARN + "Failed to get CEA-708 reader.");
-    m_useBackground = (bool)gCoreContext->GetNumSetting("CCBackground", 0);
-    m_textFontZoom  = gCoreContext->GetNumSetting("OSDCC708TextZoom", 100);
+    m_useBackground = (bool)m_player->GetPlaySettings()->GetNumSetting("CCBackground", 0);
+    m_textFontZoom   = m_player->GetPlaySettings()->GetNumSetting("OSDCC708TextZoom", 100);
     return true;
 }
 

mythtv/libs/libmythtv/textsubtitleparser.cpp

@@ -21 +21 @@
 #include "ringbuffer.h"
 #include "textsubtitleparser.h"
 #include "xine_demux_sputext.h"
+#include "playsettings.h"
 
 static bool operator<(const text_subtitle_t& left,
                       const text_subtitle_t& right)
@@ -116 +117 @@
     m_lock.unlock();
 }
 
-bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target)
+bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target,
+                                       PlaySettings *settings)
 {
     demux_sputext_t sub_data;
     sub_data.rbuffer = RingBuffer::Create(fileName, 0, false);
@@ -134 +136 @@
     target.SetFrameBasedTiming(!sub_data.uses_time);
 
     QTextCodec *textCodec = NULL;
-    QString codec = gCoreContext->GetSetting("SubtitleCodec", "");
+    QString codec = settings->GetSetting("SubtitleCodec", "");
     if (!codec.isEmpty())
         textCodec = QTextCodec::codecForName(codec.toLatin1());
     if (!textCodec)

mythtv/libs/libmythtv/textsubtitleparser.h

@@ -17 +17 @@
 // Qt headers
 #include <QStringList>
 
+class PlaySettings;
+
 class text_subtitle_t
 {
   public:
@@ -79 +81 @@
 class TextSubtitleParser
 {
   public:
-    static bool LoadSubtitles(QString fileName, TextSubtitles &target);
+    static bool LoadSubtitles(QString fileName, TextSubtitles &target,
+                              PlaySettings *settings);
 };
 
 #endif

mythtv/libs/libmythtv/tv_play.cpp

@@ -58 +58 @@
 #include "videometadatautil.h"
 #include "mythdirs.h"
 #include "tvbrowsehelper.h"
+#include "playsettings.h"
 
 #if ! HAVE_ROUND
 #define round(x) ((int) ((x) + 0.5))
@@ -208 +209 @@
     bool startInGuide = flags & kStartTVInGuide;
     bool inPlaylist = flags & kStartTVInPlayList;
     bool initByNetworkCommand = flags & kStartTVByNetworkCommand;
-    TV *tv = new TV();
     bool quitAll = false;
     bool showDialogs = true;
     bool playCompleted = false;
@@ -222 +222 @@
         curProgram->SetIgnoreBookmark(flags & kStartTVIgnoreBookmark);
     }
 
+    PlaySettings settings(curProgram ? curProgram->GetPlaybackGroup() : "Default");
+    TV *tv = new TV(&settings);
+
     // Initialize TV
     if (!tv->Init())
     {
@@ -252 +255 @@
         if (curProgram)
         {
             VERBOSE(VB_PLAYBACK, LOC + "tv->Playback() -- begin");
-            if (!tv->Playback(*curProgram))
+            if (!tv->Playback(*curProgram, &settings))
             {
                 quitAll = true;
             }
@@ -838 +841 @@
 /** \fn TV::TV(void)
  *  \sa Init(void)
  */
-TV::TV(void)
+TV::TV(PlaySettings *settings)
     : // Configuration variables from database
       baseFilters(""),
       db_channel_format("<num> <sign>"),
@@ -936 +939 @@
     playerActive = 0;
     playerLock.unlock();
 
-    InitFromDB();
+    InitFromDB(settings);
 
     VERBOSE(VB_PLAYBACK, LOC + "ctor -- end");
 }
 
-void TV::InitFromDB(void)
+void TV::InitFromDB(PlaySettings *settings)
 {
     QMap<QString,QString> kv;
     kv["LiveTVIdleTimeout"]        = "0";
@@ -988 +991 @@
         kv[QString("FFRewSpeed%1").arg(i)] = QString::number(ff_rew_def[i]);
 
     MythDB::getMythDB()->GetSettings(kv);
+    settings->AddToMap(kv);
 
     QString db_time_format;
     QString db_short_date_format;
@@ -1742 +1746 @@
     askAllowLock.unlock();
 }
 
-int TV::Playback(const ProgramInfo &rcinfo)
+int TV::Playback(const ProgramInfo &rcinfo, PlaySettings *settings)
 {
     wantsToQuit   = false;
     jumpToProgram = false;
@@ -1756 +1760 @@
         return 0;
     }
 
-    mctx->SetPlayingInfo(&rcinfo);
+    mctx->SetPlayingInfo(&rcinfo, settings);
     mctx->SetInitialTVState(false);
     ScheduleStateChange(mctx);
 
@@ -1839 +1843 @@
 
     if (fileexists)
     {
-        Playback(pginfo);
+        PlaySettings settings("Default");
+        Playback(pginfo, &settings);
         retval = 1;
     }
 
@@ -2224 +2229 @@
             QString msg = tr("%1 Settings")
                     .arg(tv_i18n(ctx->playingInfo->GetPlaybackGroup()));
             ctx->UnlockPlayingInfo(__FILE__, __LINE__);
-            if (count > 0)
+            if (count > 0 &&
+                ctx->playingInfo->GetPlaybackGroup() != "Default" &&
+                ctx->playingInfo->GetPlaybackGroup() != "Videos")
                 SetOSDMessage(ctx, msg);
             ITVRestart(ctx, false);
         }

mythtv/libs/libmythtv/tv_play.h

@@ -60 +60 @@
 class OSDListTreeItemSelectedEvent;
 class TVBrowseHelper;
 struct osdInfo;
+class PlaySettings;
 
 typedef QMap<QString,InfoMap>    DDValueMap;
 typedef QMap<QString,DDValueMap> DDKeyMap;
@@ -182 +183 @@
         unsigned long seconds;
     };
 
-    TV(void);
+    TV(PlaySettings *settings);
    ~TV();
 
-    void InitFromDB(void);
+    void InitFromDB(PlaySettings *settings);
     bool Init(bool createWindow = true);
 
     // User input processing commands
@@ -209 +210 @@
 
     // 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;

mythtv/libs/libmythtv/videodisplayprofile.cpp

@@ -8 +8 @@
 #include "mythverbose.h"
 #include "videooutbase.h"
 #include "avformatdecoder.h"
+#include "playsettings.h"
 
 bool ProfileItem::IsMatch(const QSize &size, float rate) const
 {
@@ -212 +213 @@
 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)
 {
@@ -220 +221 @@
     init_statics();
 
     QString hostname    = gCoreContext->GetHostName();
-    QString cur_profile = GetDefaultProfileName(hostname);
+    QString cur_profile = GetDefaultProfileName(hostname, settings);
     uint    groupid     = GetProfileGroupID(cur_profile, hostname);
 
     item_list_t items = LoadDB(groupid);
@@ -754 +755 @@
     return list;
 }
 
-QString VideoDisplayProfile::GetDefaultProfileName(const QString &hostname)
+QString VideoDisplayProfile::GetDefaultProfileName(const QString &hostname,
+                                                   PlaySettings *settings)
 {
     QString tmp =
+        settings ? settings->GetSetting("DefaultVideoPlaybackProfile", "") :
         gCoreContext->GetSettingOnHost("DefaultVideoPlaybackProfile", hostname);
 
     QStringList profiles = GetProfiles(hostname);

mythtv/libs/libmythtv/videodisplayprofile.h

@@ -13 +13 @@
 
 #include "mythcontext.h"
 
+class PlaySettings;
+
 typedef QMap<QString,QString>     pref_map_t;
 typedef QMap<QString,QStringList> safe_map_t;
 typedef QStringList               safe_list_t;
@@ -80 +82 @@
 class MPUBLIC VideoDisplayProfile
 {
   public:
-    VideoDisplayProfile();
+    VideoDisplayProfile(PlaySettings *settings);
     ~VideoDisplayProfile();
 
     void SetInput(const QSize &size);
@@ -124 +126 @@
     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,

mythtv/libs/libmythtv/videoout_d3d.cpp

@@ -50 +50 @@
     opts.priorities->insert("direct3d", 55);
 }
 
-VideoOutputD3D::VideoOutputD3D(void)
-  : VideoOutput(),         m_lock(QMutex::Recursive),
+VideoOutputD3D::VideoOutputD3D(PlaySettigns *settings)
+  : VideoOutput(settings), m_lock(QMutex::Recursive),
     m_hWnd(NULL),          m_render(NULL),
     m_video(NULL),
     m_render_valid(false), m_render_reset(false), m_pip_active(NULL),

mythtv/libs/libmythtv/videoout_d3d.h

@@ -12 +12 @@
 {
   public:
     static void GetRenderOptions(render_opts &opts, QStringList &cpudeints);
-    VideoOutputD3D();
+    VideoOutputD3D(PlaySettings *settings);
    ~VideoOutputD3D();
 
     bool Init(int width, int height, float aspect, WId winid,

mythtv/libs/libmythtv/videoout_directfb.cpp

@@ -275 +275 @@
     opts.priorities->insert("directfb", 60);
 }
 
-VideoOutputDirectfb::VideoOutputDirectfb()
-    : 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);

mythtv/libs/libmythtv/videoout_directfb.h

@@ -12 +12 @@
 {
   public:
     static void GetRenderOptions(render_opts &opts, QStringList &cpudeints);
-    VideoOutputDirectfb();
+    VideoOutputDirectfb(PlaySettings *settings);
     ~VideoOutputDirectfb();
 
     bool Init(int width, int height, float aspect, WId winid,

mythtv/libs/libmythtv/videoout_null.cpp

@@ -28 +28 @@
     opts.priorities->insert("null", 10);
 }
 
-VideoOutputNull::VideoOutputNull() :
-    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));

mythtv/libs/libmythtv/videoout_null.h

@@ -9 +9 @@
 {
   public:
     static void GetRenderOptions(render_opts &opts, QStringList &cpudeints);
-    VideoOutputNull();
+    VideoOutputNull(PlaySettings *settings);
    ~VideoOutputNull();
 
     bool Init(int width, int height, float aspect, WId winid,

mythtv/libs/libmythtv/videoout_opengl.cpp

@@ -37 +37 @@
     opts.priorities->insert("opengl", 65);
 }
 
-VideoOutputOpenGL::VideoOutputOpenGL()
-    : VideoOutput(),
+VideoOutputOpenGL::VideoOutputOpenGL(PlaySettings *settings)
+    : VideoOutput(settings),
     gl_context_lock(QMutex::Recursive),
     gl_context(NULL), gl_videochain(NULL), gl_pipchain_active(NULL),
     gl_parent_win(0), gl_embed_win(0), gl_painter(NULL)

mythtv/libs/libmythtv/videoout_opengl.h

@@ -10 +10 @@
 {
   public:
     static void GetRenderOptions(render_opts &opts, QStringList &cpudeints);
-    VideoOutputOpenGL();
+    VideoOutputOpenGL(PlaySettings *settings);
     virtual ~VideoOutputOpenGL();
 
     virtual bool Init(int width, int height, float aspect, WId winid,

mythtv/libs/libmythtv/videoout_quartz.cpp

@@ -62 +62 @@
 #include "mythverbose.h"
 #include "videodisplayprofile.h"
 
+class PlaySettings;
+
 #define LOC     QString("VideoOutputQuartz::")
 #define LOC_ERR QString("VideoOutputQuartz Error: ")
 
@@ -1103 +1105 @@
 /** \class VideoOutputQuartz
  *  \brief Implementation of Quartz (Mac OS X windowing system) video output
  */
-VideoOutputQuartz::VideoOutputQuartz() :
-    VideoOutput(), Started(false), data(new QuartzData())
+VideoOutputQuartz::VideoOutputQuartz(PlaySettings *settings) :
+    VideoOutput(settings), Started(false), data(new QuartzData())
 {
     init(&pauseFrame, FMT_YV12, NULL, 0, 0, 0, 0);
 }
@@ -1754 +1756 @@
 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 == "ffmpeg")

mythtv/libs/libmythtv/videoout_quartz.h

@@ -2 +2 @@
 #define VIDEOOUT_QUARTZ_H_
 
 struct QuartzData;
+class PlaySettings;
 
 #include "videooutbase.h"
 
@@ -9 +10 @@
 {
   public:
     static void GetRenderOptions(render_opts &opts, QStringList &cpudeints);
-    VideoOutputQuartz();
+    VideoOutputQuartz(PlaySettings *settings);
    ~VideoOutputQuartz();
 
     bool Init(int width, int height, float aspect, WId winid,
@@ -52 +53 @@
     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(video_codec_id); }
 

mythtv/libs/libmythtv/videoout_vdpau.cpp

@@ -47 +47 @@
     opts.deints->insert("vdpau", deints);
 }
 
-VideoOutputVDPAU::VideoOutputVDPAU()
-  : m_win(0),                m_render(NULL),
+VideoOutputVDPAU::VideoOutputVDPAU(PlaySettings *settings)
+  : VideoOutput(settings), 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),
     m_checked_surface_ownership(false),
@@ -848 +848 @@
 
 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();
 

mythtv/libs/libmythtv/videoout_vdpau.h

@@ -20 +20 @@
 {
   public:
     static void GetRenderOptions(render_opts &opts);
-    VideoOutputVDPAU();
+    VideoOutputVDPAU(PlaySettings *settings);
     ~VideoOutputVDPAU();
     bool Init(int width, int height, float aspect, WId winid,
               int winx, int winy, int winw, int winh,
@@ -54 +54 @@
                                     const QSize &video_dim);
     static MythCodecID GetBestSupportedCodec(uint width, uint height,
                                              uint stream_type,
-                                             bool no_acceleration);
+                                             bool no_acceleration,
+                                             PlaySettings *settings);
     virtual bool IsPIPSupported(void) const { return true; }
     virtual bool IsPBPSupported(void) const { return false; }
     virtual bool NeedExtraAudioDecode(void) const

mythtv/libs/libmythtv/videoout_xv.cpp

@@ -136 +136 @@
  * \see VideoOutput, VideoBuffers
  *
  */
-VideoOutputXv::VideoOutputXv()
-    : VideoOutput(),
+VideoOutputXv::VideoOutputXv(PlaySettings *settings)
+    : VideoOutput(settings),
       video_output_subtype(XVUnknown),
       global_lock(QMutex::Recursive),
 
@@ -357 +357 @@
  * \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,
@@ -381 +382 @@
     }
 
     // figure out if we want chromakeying..
-    VideoDisplayProfile vdp;
+    VideoDisplayProfile vdp(settings);
     vdp.SetInput(QSize(width, height));
     if (vdp.GetOSDRenderer() == "chromakey")
     {
@@ -600 +601 @@
     disp->StartLog();
     QString adaptor_name = QString::null;
     const QSize video_dim = window.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, &adaptor_name);
     if (xv_port == -1)

mythtv/libs/libmythtv/videoout_xv.h

@@ -30 +30 @@
     friend class ChromaKeyOSD;
   public:
     static void GetRenderOptions(render_opts &opts, QStringList &cpudeints);
-    VideoOutputXv();
+    VideoOutputXv(PlaySettings *settings);
    ~VideoOutputXv();
 
     bool Init(int width, int height, float aspect, WId winid,
@@ -83 +83 @@
     static MythCodecID GetBestSupportedCodec(uint stream_type);
 
     static int GrabSuitableXvPort(MythXDisplay* disp, Window root,
+                                  PlaySettings *settings,
                                   MythCodecID type,
                                   uint width, uint height,
                                   bool &xvsetdefaults,

mythtv/libs/libmythtv/videooutbase.cpp

@@ -7 +7 @@
 #include "mythplayer.h"
 #include "videodisplayprofile.h"
 #include "decoderbase.h"
+#include "playsettings.h"
 
 #include "mythcorecontext.h"
 #include "mythverbose.h"
@@ -109 +110 @@
         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;
 
@@ -154 +156 @@
     QString renderer = QString::null;
     if (renderers.size() > 0)
     {
-        VideoDisplayProfile vprof;
+        VideoDisplayProfile vprof(settings);
         vprof.SetInput(video_dim);
 
         QString tmp = vprof.GetVideoRenderer();
@@ -182 +184 @@
 
 #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 USING_QUARTZ_VIDEO
         if (osxlist.contains(renderer))
-            vo = new VideoOutputQuartz();
+            vo = new VideoOutputQuartz(settings);
 #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();
+            vo = new VideoOutputVDPAU(settings);
 #endif // USING_VDPAU
 
 #ifdef USING_XV
         if (xvlist.contains(renderer))
-            vo = new VideoOutputXv();
+            vo = new VideoOutputXv(settings);
 #endif // USING_XV
 
         if (vo)
@@ -305 +307 @@
  * \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
+    window(_settings),
     db_display_dim(0,0),
     db_aspectoverride(kAspect_Off), db_adjustfill(kAdjustFill_Off),
     db_letterbox_colour(kLetterBoxColour_Black),
@@ -343 +346 @@
     monitor_sz(640,480),                monitor_dim(400,300),
 
     // OSD
-    osd_painter(NULL),                  osd_image(NULL)
+    osd_painter(NULL),                  osd_image(NULL),
+    settings(_settings)
 
 {
     bzero(&pip_tmp_image, sizeof(pip_tmp_image));
-    db_display_dim = QSize(gCoreContext->GetNumSetting("DisplaySizeWidth",  0),
-                           gCoreContext->GetNumSetting("DisplaySizeHeight", 0));
+    db_display_dim = QSize(settings->GetNumSetting("DisplaySizeWidth",  0),
+                           settings->GetNumSetting("DisplaySizeHeight", 0));
 
     db_aspectoverride = (AspectOverrideMode)
-        gCoreContext->GetNumSetting("AspectOverride",      0);
+        settings->GetNumSetting("AspectOverride",      0);
     db_adjustfill = (AdjustFillMode)
-        gCoreContext->GetNumSetting("AdjustFill",          0);
+        settings->GetNumSetting("AdjustFill",          0);
     db_letterbox_colour = (LetterBoxColour)
-        gCoreContext->GetNumSetting("LetterboxColour",     0);
+        settings->GetNumSetting("LetterboxColour",     0);
 
     if (!gCoreContext->IsDatabaseIgnored())
-        db_vdisp_profile = new VideoDisplayProfile();
+        db_vdisp_profile = new VideoDisplayProfile(settings);
 }
 
 /**
@@ -434 +438 @@
     return QString::null;
 }
 
-bool VideoOutput::IsPreferredRenderer(QSize video_size)
+bool VideoOutput::IsPreferredRenderer(QSize video_size, PlaySettings *settings)
 {
     if (!db_vdisp_profile || (video_size == window.GetVideoDispDim()))
         return true;
 
-    VideoDisplayProfile vdisp;
+    VideoDisplayProfile vdisp(settings);
     vdisp.SetInput(video_size);
     QString new_rend = vdisp.GetVideoRenderer();
     if (new_rend.isEmpty())

mythtv/libs/libmythtv/videooutbase.h

@@ -34 +34 @@
 class FilterChain;
 class FilterManager;
 class OpenGLContextGLX;
+class PlaySettings;
 
 typedef QMap<MythPlayer*,PIPLocation> PIPMap;
 
@@ -54 +55 @@
         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,
@@ -64 +66 @@
                       int winh, MythCodecID codec_id, 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);
@@ -331 +333 @@
     // OSD painter and surface
     MythYUVAPainter *osd_painter;
     MythImage       *osd_image;
+
+    PlaySettings *settings;
 };
 
 #endif

mythtv/libs/libmythtv/videooutwindow.cpp

@@ -29 +29 @@
 
 #include "videooutwindow.h"
 #include "osd.h"
+#include "playsettings.h"
 #include "mythplayer.h"
 #include "videodisplayprofile.h"
 #include "decoderbase.h"
@@ -53 +54 @@
 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 +86 @@
 
     // Various state variables
     embedding(false), needrepaint(false),
-    allowpreviewepg(true), pip_state(kPIPOff)
+    allowpreviewepg(true), pip_state(kPIPOff),
+
+    settings(_settings)
 {
     db_pip_size = gCoreContext->GetNumSetting("PIPSize", 26);
 
-    db_move = QPoint(gCoreContext->GetNumSetting("xScanDisplacement", 0),
-                     gCoreContext->GetNumSetting("yScanDisplacement", 0));
+    db_move = QPoint(settings->GetNumSetting("xScanDisplacement", 0),
+                     settings->GetNumSetting("yScanDisplacement", 0));
     db_use_gui_size = gCoreContext->GetNumSetting("GuiSizeForTV", 0);
 
     QDesktopWidget *desktop = NULL;
@@ -615 +618 @@
     if (change)
     {
         db_scale_vert =
-            gCoreContext->GetNumSetting("VertScanPercentage", 0) * 0.01f;
+            settings->GetNumSetting("VertScanPercentage", 0) * 0.01f;
         db_scale_horiz =
-            gCoreContext->GetNumSetting("HorizScanPercentage", 0) * 0.01f;
+            settings->GetNumSetting("HorizScanPercentage", 0) * 0.01f;
         db_scaling_allowed = true;
     }
     else

mythtv/libs/libmythtv/videooutwindow.h

@@ -16 +16 @@
 #include "videoouttypes.h"
 
 class MythPlayer;
+class PlaySettings;
 
 class VideoOutWindow
 {
   public:
-    VideoOutWindow();
+    VideoOutWindow(PlaySettings *settings);
 
     bool Init(const QSize &new_video_dim, float aspect,
               const QRect &new_display_visible_rect,
@@ -164 +165 @@
     bool     allowpreviewepg;
     PIPState pip_state;
 
+    PlaySettings *settings;
+
     // Constants
     static const float kManualZoomMaxHorizontalZoom;
     static const float kManualZoomMaxVerticalZoom;

mythtv/libs/libmythtv/vsync.cpp

@@ -34 +34 @@
 
 #include "mythcontext.h"
 #include "mythmainwindow.h"
+#include "playsettings.h"
 
 #ifdef USING_XV
 #include "videoout_xv.h"
@@ -78 +79 @@
  *  \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)
 {
@@ -103 +105 @@
     TESTVIDEOSYNC(DRMVideoSync);
 #ifdef USING_OPENGL_VSYNC
 /*
-    if (gCoreContext->GetNumSetting("UseOpenGLVSync", 1) &&
+    if (settings->GetNumSetting("UseOpenGLVSync", 1) &&
        (getenv("NO_OPENGL_VSYNC") == NULL))
     {
         TESTVIDEOSYNC(OpenGLVideoSync);

mythtv/libs/libmythtv/vsync.h

@@ -89 +89 @@
 
     // documented in vsync.cpp
     static VideoSync *BestMethod(VideoOutput*,
+                                 PlaySettings *settings,
                                  uint frame_interval, uint refresh_interval,
                                  bool interlaced);
   protected:

mythtv/programs/mythavtest/main.cpp

@@ -18 +18 @@
 #include "mythdbcon.h"
 #include "compat.h"
 #include "dbcheck.h"
+#include "playsettings.h"
 
 // libmythui
 #include "mythuihelper.h"
@@ -188 +189 @@
 
     GetMythUI()->LoadQtConfig();
 
-#if defined(Q_OS_MACX)
-    // Mac OS X doesn't define the AudioOutputDevice setting
-#else
-    QString auddevice = gCoreContext->GetSetting("AudioOutputDevice");
-    if (auddevice.isEmpty())
-    {
-        VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need "
-                "to run 'mythfrontend', not 'mythtv'.");
-        return TV_EXIT_NO_AUDIO;
-    }
-#endif
-
     MythMainWindow *mainWindow = GetMythMainWindow();
     mainWindow->Init();
 
@@ -212 +201 @@
         return GENERIC_EXIT_DB_OUTOFDATE;
     }
 
-    TV *tv = new TV();
+    QString playgroup("");
+    if (!filename.isEmpty())
+    {
+        ProgramInfo pg(filename);
+        playgroup = pg.GetPlaybackGroup();
+    }
+    PlaySettings settings(playgroup);
+
+#if defined(Q_OS_MACX)
+    // Mac OS X doesn't define the AudioOutputDevice setting
+#else
+    QString auddevice = settings.GetSetting("AudioOutputDevice", "");
+    if (auddevice.isEmpty())
+    {
+        VERBOSE(VB_IMPORTANT, "Fatal Error: Audio not configured, you need "
+                "to run 'mythfrontend', not 'mythtv'.");
+        return TV_EXIT_NO_AUDIO;
+    }
+#endif
+
+    TV *tv = new TV(&settings);
     if (!tv->Init())
     {
         VERBOSE(VB_IMPORTANT, "Fatal Error: Could not initialize TV class.");

mythtv/programs/mythfrontend/globalsettings.cpp

@@ -38 +38 @@
 #include "mythconfig.h"
 #include "mythdirs.h"
 #include "mythuihelper.h"
+#include "playsettings.h"
+
+#define CREATE_CHECKBOX_SETTING(var, name, settings) \
+    BooleanSetting *var; \
+    if ((settings)) \
+        var = new PlaySettingsCheckBox((name), (settings)); \
+    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_COMBOBOX1_SETTING(var, name, settings, arg1) \
+    ComboBoxSetting *var; \
+    if ((settings)) \
+        var = new PlaySettingsComboBox((name), (settings), (arg1)); \
+    else \
+        var = new HostComboBox((name), (arg1))
+
+#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))
+
+// For PlaySettings, use a SpinBox instead of a Slider so that a
+// default value can be easily used.
+#define CREATE_SLIDER_SETTING(var, name, settings, arg1, arg2, arg3) \
+    BoundedIntegerSetting *var; \
+    if ((settings)) \
+        var = new PlaySettingsSpinBox((name), (settings), (arg1), (arg2), (arg3)); \
+    else \
+        var = new HostSlider((name), (arg1), (arg2), (arg3))
+
+#define CREATE_IMAGESELECT_SETTING(var, name, settings) \
+    ImageSelectSetting *var; \
+    if ((settings)) \
+        var = new PlaySettingsImageSelect((name), (settings)); \
+    else \
+        var = new HostImageSelect((name))
+
+static Setting *wrap(Setting *obj, PlaySettings *settings,
+                     bool twoLineLabel=false)
+{
+    if (!settings)
+        return obj;
+
+    // Get the setting name
+    PlaySettingsCombinedStorage *storage =
+        dynamic_cast<PlaySettingsCombinedStorage *>(obj);
+    const QString &name = storage->getName();
+
+    // Get the default value and label.  The label is  different
+    // from the value for most object types.
+    QString defaultValue = settings->GetSetting(name, "", true);
+    QString defaultLabel(defaultValue);
+    if (dynamic_cast<BooleanSetting *>(obj))
+        defaultLabel = (defaultValue == "0" || defaultValue.isEmpty() ?
+                        QObject::tr("disabled") : QObject::tr("enabled"));
+    if (dynamic_cast<SpinBoxSetting *>(obj) && defaultValue.isEmpty())
+        defaultLabel = "0";
+    ComboBoxSetting *cb = dynamic_cast<ComboBoxSetting *>(obj);
+    if (cb)
+    {
+        defaultLabel = cb->GetValueLabel(defaultValue);
+        // Add the default selection to a ComboBox
+        cb->addSelection(QString("(") + QObject::tr("default") + ")",
+                         storage->getDefault(),
+                         !settings->IsOverridden(name),
+                         true);
+    }
+    ImageSelectSetting *is = dynamic_cast<ImageSelectSetting *>(obj);
+    if (is)
+    {
+        defaultLabel = is->GetValueLabel(defaultValue);
+        // Add the default selection to a ImageSelect
+        is->addDefaultSelection(QString("(") + QObject::tr("default") + ")",
+                                storage->getDefault(),
+                                defaultValue,
+                                !settings->IsOverridden(name));
+    }
+    
+    // Change the help text to include the default and its source.
+    QString helpPrefix;
+    if (dynamic_cast<LineEditSetting *>(obj))
+        helpPrefix = QObject::tr("Leave blank to keep default value");
+    else
+        helpPrefix = QObject::tr("Override default value");
+    helpPrefix += " (" + defaultLabel + ") ";
+    QString inheritsFrom = settings->InheritsFrom(name);
+    if (inheritsFrom.isNull())
+        helpPrefix += QObject::tr("from global settings");
+    else
+        helpPrefix += QObject::tr("from group") + " " + inheritsFrom;
+    helpPrefix += ". " + obj->getHelpText();
+    obj->setHelpText(helpPrefix);
+
+    // Change the label to include the default.
+    obj->setLabel(obj->getLabel() + (twoLineLabel ? "\n" : "") +
+                  " (" + defaultLabel + ")");
+
+    return obj;
+}
 
 class TriggeredItem : public TriggeredConfigurationGroup
 {
@@ -589 +704 @@
     return gs;
 }
 
-static HostCheckBox *DecodeExtraAudio()
+static Setting *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 "
@@ -600 +715 @@
                     "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 Setting *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 HostComboBox *DisplayRecGroup()
@@ -696 +811 @@
     return gc;
 }
 
-static HostCheckBox *SmartForward()
+static Setting *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 Setting *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()
@@ -742 +857 @@
     return gc;
 }
 
-static HostComboBox *AutoCommercialSkip()
+static Setting *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");
@@ -753 +868 @@
                     "have been flagged during automatic commercial detection "
                     "or by the mythcommflag program, or just notify that a "
                     "commercial has been detected."));
-    return gc;
+    return wrap(gc, settings);
 }
 
 static GlobalCheckBox *AutoCommercialFlag()
@@ -827 +942 @@
     return bc;
 }
 
-static HostSpinBox *CommRewindAmount()
+static Setting *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 automatic rewind amount (secs)"));
     gs->setHelpText(QObject::tr("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 Setting *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 (secs)"));
     gs->setHelpText(QObject::tr("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()
@@ -1648 +1763 @@
     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 = gCoreContext->GetHostName();
     QStringList profiles = VideoDisplayProfile::GetProfiles(host);
@@ -1680 +1800 @@
         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);
@@ -1824 +1950 @@
     return gc;
 }
 
-static HostSpinBox *FFRewReposTime()
+static Setting *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 "
@@ -1834 +1960 @@
                     "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 Setting *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 "
@@ -1847 +1973 @@
                     "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 HostComboBox *MenuTheme()
@@ -1884 +2010 @@
     return gc;
 }
 
-static HostSpinBox *OSDCC708TextZoomPercentage(void)
+static Setting *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("Subtitle text zoom percentage"));
     gs->setValue(100);
     gs->setHelpText(QObject::tr("Use this to enlarge or shrink text based subtitles."));
 
-    return gs;
+    return wrap(gs, settings);
 }
 
 static HostComboBox *SubtitleFont()
@@ -1911 +2038 @@
     return hcb;
 }
 
-static HostComboBox *SubtitleCodec()
+static Setting *SubtitleCodec(PlaySettings *settings)
 {
-    HostComboBox *gc = new HostComboBox("SubtitleCodec");
+    CREATE_COMBOBOX_SETTING(gc, "SubtitleCodec", settings);
 
     gc->setLabel(QObject::tr("Subtitle Codec"));
     QList<QByteArray> list = QTextCodec::availableCodecs();
@@ -1923 +2050 @@
         gc->addSelection(val, val, val.toLower() == "utf-8");
     }
 
-    return gc;
+    return wrap(gc, settings);
 }
 
 static HostComboBox *ChannelOrdering()
@@ -1935 +2062 @@
     return gc;
 }
 
-static HostSpinBox *VertScanPercentage()
+static Setting *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 Setting *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 Setting *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 Setting *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 *CCBackground()
+static Setting *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 Setting *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(
@@ -1997 +2128 @@
                         "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 Setting *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(
@@ -2010 +2141 @@
             "If enabled, the newer EIA-708 captions will be preferred over "
             "the older EIA-608 captions in ATSC streams."));
 
-    return gc;
+    return wrap(gc, settings);
 }
 
-static HostCheckBox *EnableMHEG()
+static Setting *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 Setting *PersistentBrowseMode(PlaySettings *settings)
 {
-    HostCheckBox *gc = new HostCheckBox("PersistentBrowseMode");
+    CREATE_CHECKBOX_SETTING(gc, "PersistentBrowseMode", settings);
     gc->setLabel(QObject::tr("Always use browse mode in Live TV"));
     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 Setting *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(
@@ -2047 +2178 @@
             "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 Setting *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("If enabled, 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 Setting *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 "
@@ -2072 +2203 @@
                     "Saved\" and \"Bookmark Cleared\". If disabled, the "
                     "SELECT key will save the current position for each "
                     "keypress."));
-    return gc;
+    return wrap(gc, settings);
 }
 
 // This currently does not work
 /*
-static HostLineEdit *UDPNotifyPort()
+static Setting *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. For additional information, see "
                     "http://www.mythtv.org/wiki/MythNotify ."));
-    return ge;
+    return wrap(ge, settings);
 }
 */
 
-static HostComboBox *PlaybackExitPrompt()
+static Setting *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");
@@ -2103 +2234 @@
                     "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 Setting *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 enabled, 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 Setting *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(
@@ -2128 +2259 @@
                         "'Watch Recording' screen when 'Jump to Program' "
                         "is activated. If enabled, the recordings are shown "
                         "in the OSD"));
-    return gc;
+    return wrap(gc, settings);
 }
 
-static HostCheckBox *ContinueEmbeddedTVPlay()
+static Setting *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(
@@ -2141 +2272 @@
                     "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 Setting *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 enabled, when you exit near the end of a "
@@ -2154 +2285 @@
                     "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()
@@ -2344 +2475 @@
     return gc;
 }
 
-static HostComboBox *LetterboxingColour()
+static Setting *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));
@@ -2356 +2487 @@
             "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 Setting *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));
@@ -2369 +2500 @@
                         "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 Setting *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));
@@ -2385 +2516 @@
     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
@@ -3310 +3441 @@
     return gs;
 }
 
-static HostCheckBox *RealtimePriority()
+static Setting *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, false);
 }
 
 static HostCheckBox *EnableMediaMon()
@@ -3476 +3607 @@
 
 #ifdef USING_OPENGL_VSYNC
 /*
-static HostCheckBox *UseOpenGLVSync()
+static Setting *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 supported by your hardware/drivers, "
                         "MythTV will use OpenGL vertical syncing for "
                         "video timing, reducing frame jitter."));
-    return gc;
+    return wrap(gc, settings);
 }
 */
 #endif
@@ -3912 +4043 @@
     return gc;
 }
 
-MainGeneralSettings::MainGeneralSettings()
+MainGeneralSettings::MainGeneralSettings(PlaySettings *settings,
+                                         ConfigurationWizard *base)
 {
+    if (!settings)
+    {
     DatabaseSettings::addDatabaseSettings(this);
 
     VerticalConfigurationGroup *pin =
@@ -3965 +4099 @@
     remotecontrol->addChild(NetworkControlEnabled());
     remotecontrol->addChild(NetworkControlPort());
     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(JumpToProgramOSD());
+    if (!settings)
+        column1->addChild(RealtimePriority(settings));
+    column1->addChild(DecodeExtraAudio(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());
+    if (!settings)
+        general1->addChild(LiveTVIdleTimeout());
 #ifdef USING_OPENGL_VSYNC
-    //general1->addChild(UseOpenGLVSync());
+    //general1->addChild(UseOpenGLVSync(settings));
 #endif // USING_OPENGL_VSYNC
-    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);
@@ -4016 +4167 @@
         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));
@@ -4065 +4224 @@
     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());
-    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());
 
@@ -4110 +4303 @@
 #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());
 
-    osd->addChild(EnableMHEG());
-    osd->addChild(PersistentBrowseMode());
-    osd->addChild(BrowseAllTuners());
-    osd->addChild(CCBackground());
-    osd->addChild(DefaultCCMode());
-    osd->addChild(PreferCC708());
+    if (!settings)
+    {
+    osd->addChild(EnableMHEG(settings));
+    osd->addChild(PersistentBrowseMode(settings));
+    osd->addChild(BrowseAllTuners(settings));
+    }
+    osd->addChild(CCBackground(settings));
+    osd->addChild(DefaultCCMode(settings));
+    osd->addChild(PreferCC708(settings));
+    if (!settings)
     osd->addChild(SubtitleFont());
-    osd->addChild(OSDCC708TextZoomPercentage());
-    osd->addChild(SubtitleCodec());
-    //osd->addChild(UDPNotifyPort());
-    addChild(osd);
+    osd->addChild(OSDCC708TextZoomPercentage(settings));
+    osd->addChild(SubtitleCodec(settings));
+    //osd->addChild(UDPNotifyPort(settings));
+    if (base)
+        base->addChild(osd);
+    else
+        addChild(osd);
 
     //VerticalConfigurationGroup *cc = new VerticalConfigurationGroup(false);
     //cc->setLabel(QObject::tr("Closed Captions"));

mythtv/programs/mythfrontend/globalsettings.h

@@ -13 +13 @@
 
 class QFileInfo;
 class AudioDeviceComboBox;
+class PlaySettings;
 
 class AudioConfigSettings : public VerticalConfigurationGroup
 {
@@ -89 +90 @@
 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
@@ -119 +122 @@
 class MainGeneralSettings : public ConfigurationWizard
 {
   public:
-    MainGeneralSettings();
+    MainGeneralSettings(PlaySettings *settings=NULL,
+                        ConfigurationWizard *base=NULL);
 };
 
 class GeneralRecPrioritiesSettings : public ConfigurationWizard
@@ -207 +211 @@
     Q_OBJECT
 
   public:
-    PlaybackProfileConfigs(const QString &str);
+    PlaybackProfileConfigs(const QString &str, PlaySettings *settings);
     virtual ~PlaybackProfileConfigs();
 
   private:
@@ -219 +223 @@
 
   private:
     QStringList   profiles;
-    HostComboBox *grouptrigger;
+    ComboBoxSetting *grouptrigger;
 };
 
 #endif

mythtv/programs/mythfrontend/main.cpp

@@ -36 +36 @@
 #include "globalsettings.h"
 #include "profilegroup.h"
 #include "playgroup.h"
+#include "playsettings.h"
 #include "networkcontrol.h"
 #include "dvdringbuffer.h"
 #include "scheduledrecording.h"
@@ -480 +481 @@
         delete statusbox;
 }
 
+ConfigurationWizard *createPlaybackSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base)
+{
+    return new PlaybackSettings(settings, base);
+}
+
+ConfigurationWizard *createOSDSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base)
+{
+    return new OSDSettings(settings, base);
+}
+
+ConfigurationWizard *createMainGeneralSettingsForPlaybackGroup(PlaySettings *settings, ConfigurationWizard *base)
+{
+    return new MainGeneralSettings(settings, base);
+}
+
+static PlayGroupEditor::SettingsLookup pbgroupSetup[] = {
+    createPlaybackSettingsForPlaybackGroup,
+    createOSDSettingsForPlaybackGroup,
+    createMainGeneralSettingsForPlaybackGroup
+};
+
 static void TVMenuCallback(void *data, QString &selection)
 {
     (void)data;
@@ -578 +600 @@
     }
     else if (sel == "settings playgroup")
     {
-        PlayGroupEditor editor;
+        PlayGroupEditor editor(pbgroupSetup,
+                               sizeof(pbgroupSetup)/sizeof(*pbgroupSetup));
         editor.exec();
     }
     else if (sel == "settings general")
@@ -770 +793 @@
             }
         }
         delete tmprbuf;
+        pginfo->SetPlaybackGroup("Videos");
     }
     else if (pginfo->IsVideo())
+    {
         pos = pginfo->QueryBookmark();
+        pginfo->SetPlaybackGroup("Videos");
+    }
 
     if (pos > 0)
     {