[UI][Qt] Not liking config, using_flags directly.

[csp-qt/common_source_project-fm7.git] / source / src / qt / gui / tab_movie_mpeg4.cpp

diff --git a/source/src/qt/gui/tab_movie_mpeg4.cpp b/source/src/qt/gui/tab_movie_mpeg4.cpp
index 5fa18f7..82d578c 100644 (file)
--- a/source/src/qt/gui/tab_movie_mpeg4.cpp
+++ b/source/src/qt/gui/tab_movie_mpeg4.cpp
@@ -12,17 +12,18 @@
 #include "dialog_movie.h"
 #include "../avio/movie_saver.h"
 #include "../../config.h"
+#include "menu_flags.h"
 
-CSP_TabMovieMPEG4::CSP_TabMovieMPEG4(MOVIE_SAVER *ms, CSP_DialogMovie *parent_window, QWidget *parent) : QWidget(parent)
+CSP_TabMovieMPEG4::CSP_TabMovieMPEG4(MOVIE_SAVER *ms, CSP_DialogMovie *parent_window,  USING_FLAGS *p, QWidget *parent) : QWidget(parent)
 {
        QString tmps;
-       
+       using_flags = p;
        p_wid = parent;
        p_movie = ms;
        p_window = parent_window;
 
-       video_maxq = config.video_mpeg4_maxq;
-       video_minq = config.video_mpeg4_minq;
+       video_maxq = using_flags->get_config_ptr()->video_mpeg4_maxq;
+       video_minq = using_flags->get_config_ptr()->video_mpeg4_minq;
        if(video_maxq < video_minq) {
                int n = video_maxq;
                video_maxq = video_minq;
@@ -59,12 +60,12 @@ CSP_TabMovieMPEG4::CSP_TabMovieMPEG4(MOVIE_SAVER *ms, CSP_DialogMovie *parent_wi
        combo_video_bitrate->addItem(QString::fromUtf8("20000Kbps"), 20000);
        for(int i = 0; i < combo_video_bitrate->count(); i++) {
                int br = combo_video_bitrate->itemData(i).toInt();
-               if(br == config.video_mpeg4_bitrate) {
+               if(br == using_flags->get_config_ptr()->video_mpeg4_bitrate) {
                        combo_video_bitrate->setCurrentIndex(i);
                }
        }
        connect(combo_video_bitrate, SIGNAL(activated(int)), this, SLOT(do_set_video_bitrate(int)));
-       video_bitrate = config.video_mpeg4_bitrate;
+       video_bitrate = using_flags->get_config_ptr()->video_mpeg4_bitrate;
 
        // Video bframes
        combo_video_bframes->addItem(QString::fromUtf8("1"), 1);
@@ -77,35 +78,35 @@ CSP_TabMovieMPEG4::CSP_TabMovieMPEG4(MOVIE_SAVER *ms, CSP_DialogMovie *parent_wi
        combo_video_bframes->addItem(QString::fromUtf8("8"), 8);
        for(int i = 0; i < combo_video_bframes->count(); i++) {
                int br = combo_video_bframes->itemData(i).toInt();
-               if(br == config.video_mpeg4_bframes) {
+               if(br == using_flags->get_config_ptr()->video_mpeg4_bframes) {
                        combo_video_bframes->setCurrentIndex(i);
                }
        }
-       video_bframes = config.video_mpeg4_bframes;
+       video_bframes = using_flags->get_config_ptr()->video_mpeg4_bframes;
        connect(combo_video_bframes, SIGNAL(activated(int)), this, SLOT(do_set_bframes(int)));
 
 
        slider_qmin = new QSlider(Qt::Horizontal, this);
        slider_qmin->setMinimum(1);
        slider_qmin->setMaximum(31);
-       slider_qmin->setValue(config.video_mpeg4_minq);
+       slider_qmin->setValue(using_flags->get_config_ptr()->video_mpeg4_minq);
        label_qmin_val = new QLabel(this);
-       tmps.setNum(config.video_mpeg4_minq);
+       tmps.setNum(using_flags->get_config_ptr()->video_mpeg4_minq);
        label_qmin_val->setText(tmps);
        label_qmin_name = new QLabel(QString::fromUtf8("QP Min"), this);
-       video_minq = config.video_mpeg4_minq;
+       video_minq = using_flags->get_config_ptr()->video_mpeg4_minq;
        connect(slider_qmin, SIGNAL(valueChanged(int)), this, SLOT(do_set_qmin(int)));
                
        slider_qmax = new QSlider(Qt::Horizontal, this);
        slider_qmax->setMinimum(1);
        slider_qmax->setMaximum(31);
-       slider_qmax->setValue(config.video_mpeg4_maxq);
+       slider_qmax->setValue(using_flags->get_config_ptr()->video_mpeg4_maxq);
        label_qmax_val = new QLabel(this);
-       tmps.setNum(config.video_mpeg4_maxq);
+       tmps.setNum(using_flags->get_config_ptr()->video_mpeg4_maxq);
        label_qmax_val->setText(tmps);
        label_qmax_name = new QLabel(QString::fromUtf8("QP Max"), this);
        connect(slider_qmax, SIGNAL(valueChanged(int)), this, SLOT(do_set_qmax(int)));
-       video_maxq = config.video_mpeg4_maxq;
+       video_maxq = using_flags->get_config_ptr()->video_mpeg4_maxq;
        
        label_title = new QLabel(QApplication::translate("MainWindow", "Set MPEG4v1 parameter.", 0), this);
        grid_layout = new QGridLayout(this);
@@ -141,11 +142,11 @@ void CSP_TabMovieMPEG4::do_set_codecs(void)
        QString value;
        // See:
        // https://libav.org/avconv.html#Video-Options
-       config.video_mpeg4_bitrate = video_bitrate;
+       using_flags->get_config_ptr()->video_mpeg4_bitrate = video_bitrate;
 
-       config.video_mpeg4_maxq = video_maxq;
-       config.video_mpeg4_minq = video_minq;
-       config.video_mpeg4_bframes = video_bframes;
+       using_flags->get_config_ptr()->video_mpeg4_maxq = video_maxq;
+       using_flags->get_config_ptr()->video_mpeg4_minq = video_minq;
+       using_flags->get_config_ptr()->video_mpeg4_bframes = video_bframes;
 }
 
 void CSP_TabMovieMPEG4::do_set_qmin(int n)