Commit d8bc5857 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

Merge branch 'master' of https://git.rwth-aachen.de/ita/Redstart

parents 0db583c2 75845b3f
......@@ -76,6 +76,8 @@ set( Redstart_Sources
"src/RedstartCoreOutputPlainTextEdit.h"
"src/RedstartRunCirculatingSourceDialog.h"
"src/RedstartRunCirculatingSourceDialog.cpp"
"src/RedstartAboutDialog.h"
"src/RedstartAboutDialog.cpp"
)
set( Redstart_UIs
......@@ -86,6 +88,7 @@ set( Redstart_UIs
"ui/RedstartSessionExportDialog.ui"
"ui/RedstartSessionWizardDialog.ui"
"ui/RedstartRunCirculatingSourceDialog.ui"
"ui/RedstartAboutDialog.ui"
)
# Qt UI form compiler
......@@ -96,6 +99,7 @@ qt5_wrap_ui( "ui_RedstartSessionImportDialog.h" "ui/RedstartSessionImportDialog.
qt5_wrap_ui( "ui_RedstartSessionExportDialog.h" "ui/RedstartSessionExportDialog.ui" )
qt5_wrap_ui( "ui_RedstartSessionWizardDialog.h" "ui/RedstartSessionWizardDialog.ui" )
qt5_wrap_ui( "ui_RedstartRunCirculatingSourceDialog.h" "ui/RedstartRunCirculatingSourceDialog.ui" )
qt5_wrap_ui( "ui_RedstartAboutDialog.h" "ui/RedstartAboutDialog.ui" )
include_directories( "${CMAKE_CURRENT_BINARY_DIR}" ) # Qt UI form compiler generates files into this folder
......
Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University
Copyright 2015-2018 Institute of Technical Acoustics (ITA), RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
......
......@@ -4,7 +4,7 @@ Redstart is a graphical C++ client or server application for real-time auralizat
### License
Copyright 2015-2017 Institute of Technical Acoustics (ITA), RWTH Aachen University
Copyright 2015-2018 Institute of Technical Acoustics (ITA), RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
......@@ -22,16 +22,16 @@ limitations under the License.
#### Qt Creator and Windows platform
The Qt Creator requires the paths to all libraries required, but they are not automatically added to the environment. Otherwise the program execution will immediately crash without any further useful information (the reason is: it can't locate runtime libraries).
The Qt Creator requires the paths to all dependent libraries, but they are not automatically added to the environment. Otherwise, the program execution will immediately crash without any further useful information (the reason is: it can't locate runtime libraries).
A workaround:
1. Copy the `platform` folder from the Qt binaries into the `bin` folder of the project, usually a crypting name like `build-Redstart-Desktop_Qt_5_6_0_MSVC2013_64bit-Release` or similar.
2. Deploy VA with Visual Studio, you will find a folder called something like `dist/win32-x64.vc12/bin`. Add this diectory as PATH entry in Qt Creator > Project in the Build Environment section.
1. Copy the `platform` folder from the Qt binaries into the `bin` folder of the project, usually a cryptic name like `build-Redstart-Desktop_Qt_5_6_0_MSVC2013_64bit-Release` or similar.
2. Deploy VA with Visual Studio using the INSTALL directive. It will assemble binaries of the Redstart application and you will find a folder called something like `dist/win32-x64.vc12/bin`. Add this directory as PATH entry in Qt Creator > Project in the Build Environment section.
Do not forget to Build & Install VA in Visual Studio in case you modify the core! Copying DLLs is always dangerous during development ...
Do not forget to Build & Install Redstart/VA in Visual Studio in case you modify the core! Copying DLLs is always dangerous during development ...
Now you can run the program from within Qt Creator. Repeat this for every kit you want to use.
#### Visual Studio and Windows platform
You can edit the UI with Qt Designer, but Visual Studio may fail to generate / modify the source code automatically, because modification detection is not perfect. In this case it is sometimes necessary to clean up the intermediate source files in the build folder. But generally, VS is able to run Qt specific compiler calls prior to compiling the application, cmake and qmake take care of this.
You can edit the UI with Qt Designer, but Visual Studio may fail to generate / modify the source code automatically, because modification detection is not always picking up changes. In this case it is sometimes necessary to clean up the intermediate source files in the build folder. But generally, VS is able to run Qt specific compiler calls prior to compiling the application, cmake and qmake take care of this.
This diff is collapsed.
This diff is collapsed.
<RCC>
<qresource prefix="/icons">
</qresource>
<qresource prefix="/icons">
<file>VA_start_button.png</file>
<file>VA_stop_button.png</file>
</qresource>
<qresource prefix="/banners">
<file>../logo/BlackRedstartM.png</file>
</qresource>
<qresource prefix="/logos">
<file>VA_for_windows.png</file>
<file>ITA_RWTH_Redstart.png</file>
</qresource>
<qresource prefix="/files">
</qresource>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="68.79689mm"
height="31.38105mm"
viewBox="0 0 243.76849 111.1927"
id="svg4169"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="VA_start_button.svg"
inkscape:export-filename="C:\dev\VA\Redstart\res\VA_start_button.png"
inkscape:export-xdpi="119.79204"
inkscape:export-ydpi="119.79204">
<defs
id="defs4171" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4342832"
inkscape:cx="-3.9785654"
inkscape:cy="-13.715472"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1600"
inkscape:window-height="837"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<metadata
id="metadata4174">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-255.31892,-422.40279)">
<rect
style="fill:#239e16;fill-opacity:1;stroke:#000000;stroke-width:1.5559752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect4252-2"
width="109.6367"
height="242.21252"
x="-532.8175"
y="256.09689"
ry="7.8018618"
transform="matrix(0,-1,1,0,0,0)" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5559752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 352.64946,423.18078 137.47046,0 c 4.32223,0 7.80186,3.47963 7.80186,7.80186 l 0,94.03298 c 0,4.32223 -3.47963,7.80186 -7.80186,7.80186 l -137.47046,0 z"
id="rect4252-2-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssscc" />
<path
sodipodi:type="star"
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.97941643;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="path3349"
sodipodi:sides="3"
sodipodi:cx="291.03522"
sodipodi:cy="477.99915"
sodipodi:r1="50.605503"
sodipodi:r2="25.302752"
sodipodi:arg1="0"
sodipodi:arg2="1.0471976"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 341.64072,477.99915 -37.95413,21.91282 -37.95412,21.91283 0,-43.82566 0,-43.82565 37.95412,21.91283 z"
inkscape:transform-center-x="-12.65138" />
<g
id="g4254-8"
style="opacity:0.097;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1"
transform="matrix(0.49133956,0,0,0.49133956,230.13936,148.2983)">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="path4173-8-4-6"
d="m 514.27833,739.87152 -67.58609,-137.69426 -68.07575,137.69426 26.01436,0 42.06139,-89.68072 25.23922,51.45609 c 0,0 -17.23695,-5.19296 -27.24777,2.3039 31.79143,7.18761 38.51319,22.64123 38.51319,22.64123 l 7.41859,13.2795 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="path4173-8-0-8-5"
d="m 280.06543,602.17726 67.58609,137.69431 68.07575,-137.69426 -26.01436,0 -42.06139,89.68071 -25.23922,-51.45609 c 0,0 17.23695,5.19297 27.24777,-2.3039 -31.79143,-7.18765 -38.51319,-22.64123 -38.51319,-22.64123 l -7.41859,-13.27949 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:15px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="424.82907"
y="487.99609"
id="text4746"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4748"
x="424.82907"
y="487.99609"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:27.5px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle">START</tspan></text>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="68.79689mm"
height="31.38105mm"
viewBox="0 0 243.76849 111.1927"
id="svg4169"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="VA_stop_button.svg"
inkscape:export-filename="C:\dev\VA\Redstart\res\VA_stop_button.png"
inkscape:export-xdpi="120"
inkscape:export-ydpi="120">
<defs
id="defs4171" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4342832"
inkscape:cx="-3.9785654"
inkscape:cy="-13.715472"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1600"
inkscape:window-height="837"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
showguides="false" />
<metadata
id="metadata4174">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-255.31892,-422.40279)">
<rect
style="fill:#9e2416;fill-opacity:1;stroke:#000000;stroke-width:1.5559752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect4252-2"
width="109.6367"
height="242.21252"
x="-532.8175"
y="256.09689"
ry="7.8018618"
transform="matrix(0,-1,1,0,0,0)" />
<rect
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect4157"
width="65.537964"
height="65.537964"
x="272.46661"
y="445.23016"
ry="0" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5559752;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
d="m 352.64946,423.18078 137.47046,0 c 4.32223,0 7.80186,3.47963 7.80186,7.80186 l 0,94.03298 c 0,4.32223 -3.47963,7.80186 -7.80186,7.80186 l -137.47046,0 z"
id="rect4252-2-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssscc" />
<g
id="g4254-8"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1;opacity:0.097"
transform="matrix(0.49133956,0,0,0.49133956,229.8708,148.2983)">
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="path4173-8-4-6"
d="m 514.27833,739.87152 -67.58609,-137.69426 -68.07575,137.69426 26.01436,0 42.06139,-89.68072 25.23922,51.45609 c 0,0 -17.23695,-5.19296 -27.24777,2.3039 31.79143,7.18761 38.51319,22.64123 38.51319,22.64123 l 7.41859,13.2795 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccccccccc"
inkscape:connector-curvature="0"
id="path4173-8-0-8-5"
d="m 280.06543,602.17726 67.58609,137.69431 68.07575,-137.69426 -26.01436,0 -42.06139,89.68071 -25.23922,-51.45609 c 0,0 17.23695,5.19297 27.24777,-2.3039 -31.79143,-7.18765 -38.51319,-22.64123 -38.51319,-22.64123 l -7.41859,-13.27949 z"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:15px;line-height:125%;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
x="424.82907"
y="487.99609"
id="text4746"
sodipodi:linespacing="125%"
inkscape:export-xdpi="120"
inkscape:export-ydpi="120"><tspan
sodipodi:role="line"
id="tspan4748"
x="424.82907"
y="487.99609"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:27.5px;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';text-align:center;text-anchor:middle">STOP</tspan></text>
</g>
</svg>
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
#include "RedstartAboutDialog.h"
#include <ui_RedstartAboutDialog.h>
RedstartAboutDialog::RedstartAboutDialog( QWidget *parent )
: QDialog( parent )
, ui( new Ui::RedstartAboutDialog )
{
ui->setupUi( this );
QDialog::setWindowTitle( "About Redstart (and VA)" );
}
RedstartAboutDialog::~RedstartAboutDialog()
{
delete ui;
}
/*
* --------------------------------------------------------------------------------------------
*
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
* --------------------------------------------------------------------------------------------
*/
#ifndef IW_REDSTART_ABOUT_DIALOG
#define IW_REDSTART_ABOUT_DIALOG
#include <QDialog>
namespace Ui
{
class RedstartAboutDialog;
}
class RedstartAboutDialog : public QDialog
{
Q_OBJECT
public:
explicit RedstartAboutDialog( QWidget *parent );
~RedstartAboutDialog();
private slots:
private:
Ui::RedstartAboutDialog* ui;
};
#endif // IW_REDSTART_ABOUT_DIALOG
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......@@ -95,12 +95,16 @@ public:
inline void write( char c )
{
m_qLock.lock();
m_sLine += QString( 1, c );
m_qLock.unlock();
};
inline void write( const std::string& str )
{
m_qLock.lock();
m_sLine += QString( str.c_str() );
m_qLock.unlock();
};
public slots :
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......@@ -119,11 +119,10 @@ void RedstartRunCirculatingSourceDialog::CreateScene()
VA_EXCEPT2( MODAL_ERROR, "No connection to a VA core available" );
m_sSignalID = m_pVAInterface->CreateSignalSourceBufferFromFile( ui->lineEdit_macro_DemoSound->text().toStdString() ).c_str();
m_pVAInterface->SetSignalSourceBufferPlaybackAction( m_sSignalID.toStdString(), IVAInterface::VA_PLAYBACK_ACTION_PLAY );
m_pVAInterface->SetSignalSourceBufferLooping( m_sSignalID.toStdString(), true );
m_iSourceID = m_pVAInterface->CreateSoundSource( "Redstart C++ circulating sound source" );
m_pVAInterface->SetSoundSourcePose( m_iSourceID, VAVec3( 2.0f, 1.7f, 2.0f ), VAQuat( 0.0f, 0.0f, 0.0f, 1.0f ) );
//m_pVAInterface->SetSoundSourcePose( m_iSourceID, VAVec3( 2.0f, 1.7f, 2.0f ), VAQuat( 0.0f, 0.0f, 0.0f, 1.0f ) );
m_pVAInterface->SetSoundSourceSignalSource( m_iSourceID, m_sSignalID.toStdString() );
......@@ -155,6 +154,10 @@ void RedstartRunCirculatingSourceDialog::UpdateScene()
{
m_pVAInterface->SetSoundSourcePosition( m_iSourceID, v3Pos );
v3NewPos = m_pVAInterface->GetSoundSourcePosition( m_iSourceID );
// Delayed plaback start so that no part of sentence is missing (source has to be placed in space first)
if( m_pVAInterface->GetSignalSourceBufferPlaybackState( m_sSignalID.toStdString() ) != IVAInterface::VA_PLAYBACK_STATE_PLAYING )
m_pVAInterface->SetSignalSourceBufferPlaybackAction( m_sSignalID.toStdString(), IVAInterface::VA_PLAYBACK_ACTION_PLAY );
}
catch( CVAException& e )
{
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
This diff is collapsed.
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......@@ -52,6 +52,7 @@ public:
{
ASIO = 0,
PORTAUDIO = 1,
VIRTUAL = 2,
};
enum AudioSamplingRate
......@@ -116,7 +117,9 @@ public:
private slots:
void on_actionQuit_triggered();
void on_pushButton_start_stop_clicked();
void on_pushButton_start_clicked();
void on_pushButton_stop_clicked();
void on_shortcut_start_stop();
void on_pushButton_refresh_clicked();
......@@ -153,6 +156,7 @@ public:
void on_actionEdit_session_triggered();
void on_actionSession_wizard_triggered();
void on_actionDuplicate_current_session_triggered();
void on_actionAbout_Redstart_triggered();
void CoreChangeInputSignalDecibel( int );
void CoreChangeInputSignalDecibel( double );
......
......@@ -4,7 +4,7 @@
* VVV VVV A Virtual Acoustics (VA) | http://www.virtualacoustics.org
* VVV VVV AAA Licensed under the Apache License, Version 2.0
* VVV VVV AAA
* VVV VVV AAA Copyright 2015-2017
* VVV VVV AAA Copyright 2015-2018
* VVVVVV AAA Institute of Technical Acoustics (ITA)
* VVVV AAA RWTH Aachen University
*
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
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