Commit d61d4b0c authored by Davide's avatar Davide

cleaned windows src

parent 92348315
......@@ -8,57 +8,22 @@ CONFIG += c++11
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
# deviceselector.c \
dialog.cpp \
main.cpp \
publisher.cpp
HEADERS += \
# deviceselector.h \
dialog.h \
publisher.h
FORMS += \
dialog.ui
#INCLUDEPATH += /Library/Frameworks/GStreamer.framework/Versions/1.0/include/gstreamer-1.0
##INCLUDEPATH += /Library/Frameworks/GStreamer.framework/Versions/1.0/include
#INCLUDEPATH += /Library/Frameworks/GStreamer.framework/Versions/1.0/include/glib-2.0
#INCLUDEPATH += /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/glib-2.0/include
#mac: LIBS += -L/Users/davide/Desktop/Frameworks/GStreamer.framework/Versions/1.0/lib -lgstreamer-1.0
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/lib/release/ -lrtaudio.6.1.0
#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/lib/debug/ -lrtaudio.6.1.0
#else:unix: LIBS += -L$$PWD/lib/ -lrtaudio.6.1.0
#INCLUDEPATH += $$PWD/include
#DEPENDPATH += $$PWD/include
#win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../Frameworks/GStreamer.framework/Versions/1.0/lib/release/ -lgstreamer-1.0.0
#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../Frameworks/GStreamer.framework/Versions/1.0/lib/debug/ -lgstreamer-1.0.0
#else:unix: LIBS += -L$$PWD/../Frameworks/GStreamer.framework/Versions/1.0/lib/ -lgstreamer-1.0.0 -lglib-2.0 -lgobject-2.0
#INCLUDEPATH += $$PWD/../Frameworks/GStreamer.framework/Versions/1.0
#DEPENDPATH += $$PWD/../Frameworks/GStreamer.framework/Versions/1.0
unix: {
INCLUDEPATH += /usr/include/glib-2.0
INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
LIBS += -lrtaudio
LIBS += -L/usr/lib/x86_64-linux-gnu/ -lgstreamer-1.0
LIBS += -L/usr/lib/x86_64-linux-gnu/ -lglib-2.0 -lgobject-2.0
INCLUDEPATH += /usr/include/gstreamer-1.0
DEPENDPATH += /usr/include/gstreamer-1.0
}
win32 {
INCLUDEPATH += $$PWD/../../../../MinGW/msys/1.0/home/davide/cerbero/build/dist/msvc_x86_64/include/gstreamer-1.0
......@@ -73,12 +38,3 @@ win32 {
LIBS += -L$$PWD/../../../../MinGW/msys/1.0/home/davide/cerbero/build/dist/msvc_x86_64/lib/ -lglib-2.0
LIBS += -L$$PWD/../../../../MinGW/msys/1.0/home/davide/cerbero/build/dist/msvc_x86_64/lib/ -lgstreamer-1.0 -lgobject-2.0
}
#C:\MinGW\msys\1.0\home\davide\cerbero\build\dist\msvc_x86_64\include\gstreamer-1.0\gst
#else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/'../../../../Program Files (x86)/RtAudio/lib/' -lrtaudiod
#include "dialog.h"
#include "ui_dialog.h"
#include <QSettings>
//#include <rtaudio/RtAudio.h>
//extern "C" {
// #include "deviceselector.h"
//}
Dialog::Dialog(QWidget *parent)
: QDialog(parent)
......@@ -79,7 +74,6 @@ Dialog::Dialog(QWidget *parent)
m_publisher.setRoom(ui->w_room->text());
m_publisher.setAudioDevice(ui->w_audiodevice->currentText());
// ui->w_audiodevice->addItem("PulseAudio");
m_publisher.setBitRate(ui->w_bitRate->currentText());
m_publisher.setSampleRate(ui->w_sampleRate->currentText());
......@@ -88,7 +82,6 @@ Dialog::Dialog(QWidget *parent)
ui->w_disconnect->setEnabled(false);
devices();
}
Dialog::~Dialog()
......@@ -162,32 +155,6 @@ void Dialog::readSettings()
enableConnectButton();
}
void Dialog::devices() const
{
// RtAudio adc;
// unsigned int devices = adc.getDeviceCount();
// RtAudio::DeviceInfo info;
// QStringList device_list;
// qInfo() << Q_FUNC_INFO;
// deviceMonitor();
// for ( unsigned int i=0; i<devices; i++ ) {
// info = adc.getDeviceInfo( i );
// QString deviceName = QString::fromStdString(info.name);
// if(info.inputChannels > 0){
// QStringList name = deviceName.split(QLatin1Char(':'));
// device_list.append(name[1].trimmed());
// qInfo() << ;
// }
// }
// ui->w_audiodevice->addItems(device_list);
}
void Dialog::on_w_default_clicked()
......
......@@ -33,6 +33,5 @@ private:
Publisher m_publisher;
void writeSettings();
void readSettings();
void devices() const;
};
#endif // DIALOG_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment