update examples

lbblscy · Dec 1, 2015 · c804872 · c804872
1 parent 71a6c57
commit c804872
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/examples/QMLPlayer/main.cpp b/examples/QMLPlayer/main.cpp
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
             ("scale", 1.0, QLatin1String("scale of graphics context. 0: auto"))
             ;
     options.parse(argc, argv);
+    Config::setName(QString::fromLatin1("QMLPlayer"));
     do_common_options_before_qapp(options);
 
     QGuiApplication app(argc, argv);

diff --git a/examples/common/Config.cpp b/examples/common/Config.cpp
@@ -35,7 +35,10 @@ class Config::Data
 {
 public:
     Data() {
-        file = appDataDir() + QString::fromLatin1("/") + qApp->applicationName() + QString::fromLatin1(".ini");
+        if (!Data::name.isEmpty())
+            file = appDataDir() + QString::fromLatin1("/") + Data::name + QString::fromLatin1(".ini");
+        else
+            file = appDataDir() + QString::fromLatin1("/") + qApp->applicationName() + QString::fromLatin1(".ini");
         if (!QDir(appDataDir()).exists()) {
             if (!QDir().mkpath(appDataDir())) {
                 qWarning() << "Failed to create appDataDir: " << appDataDir();
@@ -267,14 +270,23 @@ class Config::Data
     qreal timeout;
     int buffer_value;
     QString log;
+
+    static QString name;
 };
 
+QString Config::Data::name;
+
 Config& Config::instance()
 {
     static Config cfg;
     return cfg;
 }
 
+void Config::setName(const QString &name)
+{
+    Config::Data::name = name;
+}
+
 Config::Config(QObject *parent)
     : QObject(parent)
     , mpData(new Data())

diff --git a/examples/common/Config.h b/examples/common/Config.h
@@ -80,7 +80,7 @@ class COMMON_EXPORT Config : public QObject
     };
 
     static Config& instance();
-
+    static void setName(const QString& name); // config file base name
     Q_INVOKABLE bool reset();
     void reload();
     /*!

diff --git a/examples/common/common.cpp b/examples/common/common.cpp
@@ -72,6 +72,7 @@ void Logger(QtMsgType type, const QMessageLogContext &, const QString& qmsg)
          fileLogger()->write(QByteArray("Fatal: "));
          abort();
      }
+     fflush(0);
      fileLogger()->write(msgArray);
      fileLogger()->write(QByteArray("\n"));
      fileLogger()->flush();

diff --git a/examples/filters/main.cpp b/examples/filters/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
     qDebug("vo: %s", vo.toUtf8().constData());
     bool opt_has_file = argc > idx + 2;
     vo = vo.toLower();
-    if (vo != QLatin1String("gl") && vo != QLatin1String("d2d") && vo != QLatin1String("gdi") && vo != QLatin1String("xv"))
+    if (vo != QLatin1String("gl") && vo != QLatin1String("d2d") && vo != QLatin1String("gdi") && vo != QLatin1String("xv") && vo != QLatin1String("x11"))
         vo = QString::fromLatin1("qpainter");
     QString title = QString::fromLatin1("QtAV %1 [email protected]").arg(QtAV_Version_String_Long());
     VideoRenderer *renderer = 0;
@@ -71,6 +71,10 @@ int main(int argc, char *argv[])
         renderer = VideoRenderer::create(VideoRendererId_GDI);
     } else if (vo == QLatin1String("xv")) {
         renderer = VideoRenderer::create(VideoRendererId_XV);
+        textfilter = true;
+    } else if (vo == QLatin1String("x11")) {
+        renderer = VideoRenderer::create(VideoRendererId_X11);
+        textfilter = true;
     } else {
         renderer = VideoRenderer::create(VideoRendererId_Widget);
         textfilter = true;

diff --git a/examples/player/main.cpp b/examples/player/main.cpp
@@ -61,6 +61,7 @@ VideoRendererId rendererId_from_opt_name(const QString& name) {
 int main(int argc, char *argv[])
 {
     qDebug() << aboutQtAV_PlainText();
+    Config::setName(QString::fromLatin1("Player"));
     QOptions options = get_common_options();
     options.add(QString::fromLatin1("player options"))
             ("ffmpeg-log",  QString(), QString::fromLatin1("ffmpeg log level. can be: quiet, panic, fatal, error, warn, info, verbose, debug. this can override env 'QTAV_FFMPEG_LOG'"))