注释没用的代码

MomentaMedia/src/BlackMagicDesign/DeckLinkInputPage.cpp

@@ -75,7 +75,7 @@ DeckLinkInputPage::DeckLinkInputPage() : SelectedDevice(nullptr), NDIOutput(null
 	PrewCheckBox = new QCheckBox();
 	PrewCheckBox = new QCheckBox();
 	PrewCheckBox->setChecked(false);
 	PrewCheckBox->setChecked(false);
 	PrewCheckBox->setMinimumWidth(kComboMinimumWidth);
 	PrewCheckBox->setMinimumWidth(kComboMinimumWidth);
-	FormLayout->addRow("Preview:", PrewCheckBox);
+	FormLayout->addRow(QString::fromWCharArray(L"Ԥ"), PrewCheckBox);
 	PrewState = PrewCheckBox->isChecked();
 	PrewState = PrewCheckBox->isChecked();
 
 
 	PreviewView = new DeckLinkOpenGLWidget(PrewState,dynamic_cast<QWidget*>(this));
 	PreviewView = new DeckLinkOpenGLWidget(PrewState,dynamic_cast<QWidget*>(this));

MomentaMedia/src/BlackMagicDesign/DeckLinkOpenGLWidget.cpp

@@ -10,7 +10,7 @@
 /// DeckLinkOpenGLOverlay
 /// DeckLinkOpenGLOverlay
 ///
 ///
 
 
-extern int PrvwFlag;
+//extern int PrvwFlag;
 
 
 DeckLinkOpenGLOverlayWidget::DeckLinkOpenGLOverlayWidget(QWidget* parent) : QWidget(parent)
 DeckLinkOpenGLOverlayWidget::DeckLinkOpenGLOverlayWidget(QWidget* parent) : QWidget(parent)
 {
 {

MomentaMedia/src/BlackMagicDesign/DeckLinkOutputDevice.cpp

@@ -5,10 +5,10 @@
 #include "BlackMagicDesign/ScreenPreviewCallback.h"
 #include "BlackMagicDesign/ScreenPreviewCallback.h"
 #include "BlackMagicDesign/ReferenceTime.h"
 #include "BlackMagicDesign/ReferenceTime.h"
 
 
-extern int OutputDeleyTime;
+//extern int OutputDeleyTime;
 extern int OutputPlayMode;
 extern int OutputPlayMode;
 extern int AudioChannel;
 extern int AudioChannel;
-extern std::map<qint32, qint32> map_output_delay;
+//extern std::map<qint32, qint32> map_output_delay;
 
 
 #define OUTPUT_1080 1
 #define OUTPUT_1080 1
 #define AUDIOMAXSIZE (OutputDeleyTime + 3) * 50
 #define AUDIOMAXSIZE (OutputDeleyTime + 3) * 50
@@ -568,7 +568,7 @@ void DeckLinkOutputDevice::AddAudioFrame(std::shared_ptr<AudioPacket> audio_pack
 
 
 void DeckLinkOutputDevice::InitResource()
 void DeckLinkOutputDevice::InitResource()
 {
 {
-	if (deckLink)
+	/*if (deckLink)
 	{
 	{
 		dlstring_t displayName;
 		dlstring_t displayName;
 		QString deviceName;
 		QString deviceName;
@@ -597,7 +597,7 @@ void DeckLinkOutputDevice::InitResource()
 				audio_max_size = (output_deley_ms / 1000 + 3) * 50;
 				audio_max_size = (output_deley_ms / 1000 + 3) * 50;
 			}
 			}
 		}
 		}
-	}
+	}*/
 }
 }
 
 
 void DeckLinkOutputDevice::SetDeleyTime(qint32& deleyTime)
 void DeckLinkOutputDevice::SetDeleyTime(qint32& deleyTime)

MomentaMedia/src/MomentaMedia.cpp

@@ -12,16 +12,16 @@
 #include "DeckLinkAPI.h"
 #include "DeckLinkAPI.h"
 
 
 
 
-int OutputDeleyTime = 5;
+//int OutputDeleyTime = 5;
 int FrontDeleyTime = 1;
 int FrontDeleyTime = 1;
 int FrameRate = 50;
 int FrameRate = 50;
-int PrvwFlag = 0;
+//int PrvwFlag = 0;
 int OutputPlayMode = 0;
 int OutputPlayMode = 0;
-int BlackBottomHeight = 240;
+//int BlackBottomHeight = 240;
 int AudioChannel = 2;
 int AudioChannel = 2;
 int ScaleMode = 0;
 int ScaleMode = 0;
 qint64 StartTimeStamp = 0;
 qint64 StartTimeStamp = 0;
-std::map<qint32, qint32> map_output_delay;
+//std::map<qint32, qint32> map_output_delay;
 std::map<qint32, qint32> map_scale_mode;
 std::map<qint32, qint32> map_scale_mode;
 
 
 int main_ver = 1;
 int main_ver = 1;
@@ -610,34 +610,34 @@ void MomentaMedia::ReadSettings()
     QString ini_path = exe_dir + "/settings.ini";
     QString ini_path = exe_dir + "/settings.ini";
     QSettings settings(ini_path, QSettings::IniFormat);
     QSettings settings(ini_path, QSettings::IniFormat);
     settings.beginGroup("DELEYTIME");
     settings.beginGroup("DELEYTIME");
-    OutputDeleyTime = settings.value("DELEY_TIME", "").toInt();
+    /*OutputDeleyTime = settings.value("DELEY_TIME", "").toInt();
     if (OutputDeleyTime < 1 * 1000) OutputDeleyTime = 1 * 1000;
     if (OutputDeleyTime < 1 * 1000) OutputDeleyTime = 1 * 1000;
-    else if (OutputDeleyTime > 20 * 1000) OutputDeleyTime = 20 * 1000;
+    else if (OutputDeleyTime > 20 * 1000) OutputDeleyTime = 20 * 1000;*/
     FrontDeleyTime = settings.value("FRONT_DELEY_TIME", "").toInt();
     FrontDeleyTime = settings.value("FRONT_DELEY_TIME", "").toInt();
-    if (FrontDeleyTime < 1 || FrontDeleyTime > OutputDeleyTime) FrontDeleyTime = 1;
+    if (FrontDeleyTime < 1 ) FrontDeleyTime = 1;
     
     
     FrameRate = settings.value("FRAME_RATE", "").toInt();
     FrameRate = settings.value("FRAME_RATE", "").toInt();
     if (FrameRate < 25) FrameRate = 25;
     if (FrameRate < 25) FrameRate = 25;
 
 
-    BlackBottomHeight = settings.value("BLACK_BOTTOM_HEIGHT").toInt();
+    /*BlackBottomHeight = settings.value("BLACK_BOTTOM_HEIGHT").toInt();
     if (BlackBottomHeight < 0) BlackBottomHeight = 0;
     if (BlackBottomHeight < 0) BlackBottomHeight = 0;
-    else if (BlackBottomHeight > 480) BlackBottomHeight = 480;
+    else if (BlackBottomHeight > 480) BlackBottomHeight = 480;*/
 
 
     AudioChannel = settings.value("AUDIO_CHANNEL").toInt();
     AudioChannel = settings.value("AUDIO_CHANNEL").toInt();
     if (AudioChannel <= 0 || AudioChannel > 20) AudioChannel = 2;
     if (AudioChannel <= 0 || AudioChannel > 20) AudioChannel = 2;
 
 
-    PrvwFlag = settings.value("PRVW_FLAG", "").toInt();
+    //PrvwFlag = settings.value("PRVW_FLAG", "").toInt();
 
 
     OutputPlayMode = settings.value("OUTPUT_PLAY_MODE", "").toInt();
     OutputPlayMode = settings.value("OUTPUT_PLAY_MODE", "").toInt();
 
 
-    for(int i = 1;i <= 4;i++)
-    {
-        std::string key = "DELEY_TIME_" + std::to_string(i);
-        int value = settings.value(QString::fromStdString(key), "").toInt();
-        if (value < 1 * 1000) value = 1 * 1000;
-        //else if (value > 60 * 1000) value = 60 * 1000;
-        map_output_delay[i] = value;
-    }
+    //for(int i = 1;i <= 4;i++)
+    //{
+    //    std::string key = "DELEY_TIME_" + std::to_string(i);
+    //    int value = settings.value(QString::fromStdString(key), "").toInt();
+    //    if (value < 1 * 1000) value = 1 * 1000;
+    //    //else if (value > 60 * 1000) value = 60 * 1000;
+    //    map_output_delay[i] = value;
+    //}
 
 
     ScaleMode = settings.value("SCALE_MODE", "").toInt();
     ScaleMode = settings.value("SCALE_MODE", "").toInt();
     if (ScaleMode < 0) ScaleMode = 0;
     if (ScaleMode < 0) ScaleMode = 0;