소스 검색

AudioDecode

1.修改编码为UTF-8 BOM,支持代码中直接写中文了。
huihui 5 년 전
부모
커밋
b4da7a1f8c

+ 1 - 6
source/AudioDecode/AudioDecoder/AudioDecoder.pri

@@ -35,12 +35,6 @@ include($$PWD/lib/RtAudio/RtAudio.pri)
 
 win32{
 
-QMAKE_CFLAGS_DEBUG += -MT
-QMAKE_CXXFLAGS_DEBUG += -MT
-
-QMAKE_CFLAGS_RELEASE += -MT
-QMAKE_CXXFLAGS_RELEASE += -MT
-
     DEFINES += NDEBUG WIN32 _CONSOLE __WINDOWS_ASIO__ __WINDOWS_DS__ __WINDOWS_WASAPI__
 
     contains(QT_ARCH, i386) {
@@ -61,6 +55,7 @@ QMAKE_CXXFLAGS_RELEASE += -MT
         LIBS += -L$$PWD/lib/win64/SDL2/lib -lSDL2
     }
 
+    LIBS += -lmfplat -lmfuuid -lksuser -lwinmm -lwmcodecdspuuid
 }
 
 unix{

+ 0 - 6
source/AudioDecode/AudioDecoder/src/AudioReader/ReadAudioFileThread.cpp

@@ -19,12 +19,6 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <unistd.h>
-
-void Sleep(long mSeconds)
-{
-    usleep(mSeconds * 1000);
-}
-
 #endif
 
 #define PCMTYPE short

+ 2 - 1
source/AudioDecode/AudioDecoder/src/MoudleConfig.h

@@ -2,8 +2,9 @@
 #define MOUDLECONFIG_H
 
 #include <stdio.h>
-#include <string>
+#include <string.h>
 #include <stdint.h>
+#include <string>
 
 #if defined(WIN32)
 

+ 1 - 1
source/AudioDecode/src/AppConfig.cpp

@@ -1,4 +1,4 @@
-#include "AppConfig.h"
+#include "AppConfig.h"
 
 #include <QProcess>
 #include <QDesktopWidget>

+ 1 - 1
source/AudioDecode/src/AppConfig.h

@@ -1,4 +1,4 @@
-#ifndef APPCONFIG_H
+#ifndef APPCONFIG_H
 #define APPCONFIG_H
 
 #include <QFile>

+ 2 - 2
source/AudioDecode/src/Base/FunctionTransfer.cpp

@@ -1,4 +1,4 @@
-#include "FunctionTransfer.h"
+#include "FunctionTransfer.h"
 
 #include <QThread>
 #include <QDebug>
@@ -11,7 +11,7 @@ Q_DECLARE_METATYPE(std::function<void()>)
 FunctionTransfer::FunctionTransfer(QObject *parent) :
     QObject(parent)
 {
-    //ÒòΪstd::function<void()>ÊÇ×Ô¶¨ÒåµÄÀàÐÍ Òª¿çÏ̴߳«µÝÐèÒªÏÈ×¢²áÒ»ÏÂ
+    //因为std::function<void()>是自定义的类型 �跨线程传递需�先注册一下
     qRegisterMetaType<std::function<void()>>();
 
     connect(this, SIGNAL(comming(std::function<void()>)), this, SLOT(slotExec(std::function<void()>)), Qt::BlockingQueuedConnection);

+ 6 - 6
source/AudioDecode/src/Base/FunctionTransfer.h

@@ -1,4 +1,4 @@
-#ifndef FUNCTIONTRANSFER_H
+#ifndef FUNCTIONTRANSFER_H
 #define FUNCTIONTRANSFER_H
 
 #include  <functional>
@@ -17,7 +17,7 @@ class FunctionTransfer : public QObject
     Q_OBJECT
 public:
 
-    ///@brief ¹¹Ô캯Êý
+    ///@brief 构造函数
     explicit FunctionTransfer(QObject *parent = 0);
     ~FunctionTransfer();
 
@@ -25,22 +25,22 @@ public:
     static bool isMainThread();
 
 public:
-    ///@brief ÖÆ¶¨º¯ÊýfÔÚmainÖÐÖ´ÐÐ
+    ///@brief 制定函数f在main中执行
     static void runInMainThread(std::function<void()> f, bool isBlock = false);
 
 private:
     static Qt::HANDLE gMainThreadId;
 
-    //ÔÚÈ«¾ÖÊý¾ÝÇøÊµÀý»¯Ò»¸öFunctionTransferµÄʵÀý£¬¸ÃʵÀýËùÔÚµÄÏ߳̾ÍÊÇÖ÷Ï̡߳£
+    //在全局数�区实例化一个FunctionTransfer的实例,该实例所在的线程就是主线程。
     static FunctionTransfer *main_thread_forward;
 
 Q_SIGNALS:
-    ///@brief ÔÚ±ðµÄÏß³ÌÓк¯Êý¶ÔÏó´«À´
+    ///@brief 在别的线程有函数对象传�
     void comming(std::function<void()> f);
     void comming_noBlock(std::function<void()> f);
 
 private Q_SLOTS:
-    ///@brief Ö´Ðк¯Êý¶ÔÏó
+    ///@brief 执行函数对象
     void slotExec(std::function<void()> f);
 
 };

+ 3 - 3
source/AudioDecode/src/MainWindow.cpp

@@ -1,4 +1,4 @@
-#include "MainWindow.h"
+#include "MainWindow.h"
 #include "ui_MainWindow.h"
 
 #include <QDebug>
@@ -62,8 +62,8 @@ MainWindow::MainWindow(QWidget *parent) :
         return chartView;
     };
 
-    mChartView_Left  = createView("left channel", true);
-    mChartView_Right = createView("right channel", true);
+    mChartView_Left  = createView(QStringLiteral("左声道"), true);
+    mChartView_Right = createView(QStringLiteral("右声道"), true);
 
     mCurrentChartView_Left  = createView("left channel(one frame)", false);
     mCurrentChartView_Right = createView("right channel(2 seconds)", false);

+ 1 - 1
source/AudioDecode/src/MainWindow.h

@@ -1,4 +1,4 @@
-#ifndef MAINWINDOW_H
+#ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <QMainWindow>

+ 1 - 1
source/AudioDecode/src/main.cpp

@@ -1,4 +1,4 @@
-/*
+/*
                    _ooOoo_
                   o8888888o
                   88" . "88