Ticket #1288: switch_for_overriding_RunFrontendInWindow.patch

libs/libmyth/mythcontext.h

@@ -348 +348 @@
                                  double defaultval = 0.0);
 
     void SetSetting(const QString &key, const QString &newValue);
-
+    void OverrideSettingForSession(const QString &key, const QString &newValue);
     QFont GetBigFont();
     QFont GetMediumFont();
     QFont GetSmallFont();
@@ -427 +427 @@
     bool useSettingsCache;
     QMutex cacheLock;
     QMap <QString, QString> settingsCache;
+    /// The settings that are overridden for this session.
+    QMap <QString, QString> overriddenSettings;
+    QMutex overriddenSettingsLock;
 
     QMutex locationLock;
     QValueList <QString> currentLocation;

libs/libmyth/mythcontext.cpp

@@ -1766 +1766 @@
     bool found = false;
     QString value;
 
+    overriddenSettingsLock.lock();
+    if (overriddenSettings.contains(key)) {
+        value = overriddenSettings[key];
+        overriddenSettingsLock.unlock();
+        return value;
+    }
+    overriddenSettingsLock.unlock();
+
     if (useSettingsCache)
     {
         cacheLock.lock();
@@ -2291 +2299 @@
     ClearSettingsCache(key, newValue);
 }
 
+/** \fn MythContext::OverrideSettingForSession()
+ *  \brief Overrides the given setting for the execution time of the process.
+ *
+ * This allows defining settings for the session only, without touching the
+ * settings in the data base.
+ */
+void MythContext::OverrideSettingForSession(const QString &key, 
+                                            const QString &value)
+{
+    overriddenSettingsLock.lock();
+    overriddenSettings[key] = value;
+    overriddenSettingsLock.unlock();
+}
+
+
 bool MythContext::SendReceiveStringList(QStringList &strlist, bool quickTimeout, bool block)
 {
     d->serverSockLock.lock();

programs/mythfrontend/main.cpp

@@ -761 +761 @@
     QString binname = finfo.baseName();
 
     bool ResetSettings = false;
-
+    bool OverrideRunFrontendInWindow = false;
+    int RunFrontendInWindow = 0;
     if (binname != "mythfrontend")
         pluginname = binname;
 
@@ -820 +821 @@
         {
             ResetSettings = true;
         }
+        else if (!strcmp(a.argv()[argpos],"-w") ||
+                 !strcmp(a.argv()[argpos],"--windowed"))
+        {
+            OverrideRunFrontendInWindow = true;
+            RunFrontendInWindow = 1;
+        }
+        else if (!strcmp(a.argv()[argpos],"-nw") ||
+                 !strcmp(a.argv()[argpos],"--no-windowed"))
+        {
+            OverrideRunFrontendInWindow = true;
+            RunFrontendInWindow = 0;
+        }
         else if (!strcmp(a.argv()[argpos],"-geometry") ||
                  !strcmp(a.argv()[argpos],"--geometry"))
         {
@@ -859 +872 @@
                     "--geometry WxH+X+Y             Override window size and position\n" <<
                     "-l or --logfile filename       Writes STDERR and STDOUT messages to filename" << endl <<
                     "-r or --reset                  Resets frontend appearance settings and language" << endl <<
-                    "-v or --verbose debug-level    Use '-v help' for level info" << endl <<
+                    "-v or --verbose debug-level    Use '-v help' for level info" << endl <<
+                    "Override 'RunFrontendInWindow' setting:" << endl <<
+                    "-w/--windowed                  Run in windowed mode" << endl <<
+                    "-nw or --no-windowed           Run in non-windowed mode " << endl <<
 
                     "--version                      Version information" << endl <<
                     "<plugin>                       Initialize and run this plugin" << endl <<
@@ -933 +949 @@
                 .arg(geometry));
     }
 
+    if (OverrideRunFrontendInWindow) {
+        QString setting;
+        setting.setNum(RunFrontendInWindow);
+        gContext->OverrideSettingForSession("RunFrontendInWindow", setting);
+    }
+
     // Create priveleged thread, then drop privs
     pthread_t priv_thread;