Fixing problem with experimental session config

parent 5b42d232
......@@ -24,7 +24,7 @@ RedstartSessionExperimentalTalkthroughDialog::RedstartSessionExperimentalTalkthr
ui->setupUi( this );
QDialog::setWindowTitle( "Experimental talkthrough session" );
QSettings qSettings;
QString sLastBrowseFolder = qSettings.value( "Redstart/last_browse_folder" ).toString();
std::string s = sLastBrowseFolder.toStdString();
......@@ -73,7 +73,7 @@ QVariantHash RedstartSessionExperimentalTalkthroughDialog::GetCoreConfig() const
QStringList vsDeviceChannels = ui->lineEdit_output_channels->text().split( ",", QString::SkipEmptyParts );
QString sDeviceNames;
int i = 0;
for( QString sChannelNumber : vsDeviceChannels )
{
......@@ -81,8 +81,8 @@ QVariantHash RedstartSessionExperimentalTalkthroughDialog::GetCoreConfig() const
oDevice[ "Type" ] = "LS";
oDevice[ "Channels" ] = sChannelNumber;
QString sID = "OutputDevice:GenericDevice" + sChannelNumber;
oFinalCoreConfig[ sID ] = oDevice;
QString sID = "GenericDevice" + sChannelNumber;
oFinalCoreConfig[ "OutputDevice:" + sID ] = oDevice;
if( i++ == 0 )
sDeviceNames = sID;
else
......@@ -95,7 +95,7 @@ QVariantHash RedstartSessionExperimentalTalkthroughDialog::GetCoreConfig() const
oFinalCoreConfig[ "Output:MyGenericOutput" ] = oOutput;
QVariantHash oReproduction;
oReproduction[ "Class" ] = "Talktrough";
oReproduction[ "Class" ] = "Talkthrough";
oReproduction[ "Outputs" ] = "MyGenericOutput";
oFinalCoreConfig[ "Reproduction:MyGenericTalkthrough" ] = oReproduction;
......@@ -143,35 +143,3 @@ void RedstartSessionExperimentalTalkthroughDialog::on_pushButton_select_demo_sou
}
}
}
/*
void RedstartSessionBinauralHeadphonesDialog::on_pushButton_BrowseHRIR_clicked()
{
QFileDialog fd;
fd.setNameFilter( "DAFF files (*.daff)" );
fd.setViewMode( QFileDialog::Detail );
if( m_oLastBasePath.exists() )
fd.setDirectory( m_oLastBasePath );
else
fd.setDirectory( QDir( QApplication::applicationDirPath() ) );
if( fd.exec() )
{
QStringList lFiles = fd.selectedFiles();
if( lFiles.empty() == false )
{
QString sFilePath = lFiles[ 0 ];
QFile oFile( sFilePath );
if( oFile.exists() )
{
m_oHRIRBasePath = fd.directory();
m_oLastBasePath = m_oHRIRBasePath;
}
ui->lineEdit_macro_DefaultHRIR->setText( sFilePath );
}
}
}
*/
\ No newline at end of file
......@@ -598,8 +598,12 @@ void RedstartWindow::on_actionDefault_experimental_session_triggered()
void RedstartWindow::on_actionRunSimpleExample_triggered()
{
try
{
if( !m_pVAInterface )
VA_EXCEPT2( INVALID_PARAMETER, "No VA interface available. Please start a session, first." );
RunSimpleExample( m_pVAInterface );
}
catch( CVAException& e )
......
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