From: wittend99 Date: Thu, 31 May 2012 02:53:15 +0000 (+0000) Subject: Still working on the audio dialog, mostly. X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=b2d1bac9632f4d9ee81a22a1d6c5e0f7a97fe0a7;p=freetel-svn-tracking.git Still working on the audio dialog, mostly. git-svn-id: https://svn.code.sf.net/p/freetel/code@521 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2/FDMDV2.fbp b/fdmdv2/FDMDV2.fbp index e713e666..e25a23de 100644 --- a/fdmdv2/FDMDV2.fbp +++ b/fdmdv2/FDMDV2.fbp @@ -2428,7 +2428,7 @@ Resizable 1 - 553,455 + 553,381 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER Audio Options @@ -2479,842 +2479,2199 @@ - bSizer27 + bSizer32 wxVERTICAL none - 5 - wxEXPAND + 1 + wxEXPAND | wxALL 1 - + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bSizer271 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - + 1 + m_nbAudioOptions + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Devices + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY - Rx Input + + 0 + + + 0 - sbSizer6 - wxVERTICAL - none + 1 + m_panelDevices + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + - - 6 - wxEXPAND - 1 - - - bSizer31 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_lbRxInput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnRxInputSelect - - - - - - - - - - - - - - + + + bSizer34 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + wxID_ANY + PortAudio + + sbSizer10 + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + bSizer41 + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + + bSizer37 + wxVERTICAL + none + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + PortAudio + + 0 + + + 0 + + 1 + m_radioBtnPortAudio + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 0 + + gSizer7 + none + 4 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Audio in (mic) -> codec: + + 0 + + + 0 + + 1 + m_staticText14 + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + codec -> Radio Tx: + + 0 + + + 0 + + 1 + m_staticText15 + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Radio Rx -> codec: + + 0 + + + 0 + + 1 + m_staticText16 + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + codec -> Audio out (spkr): + + 0 + + + 0 + + 1 + m_staticText17 + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 0 + + gSizer5 + none + 4 + 0 + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_comboBox1 + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_comboBox2 + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_comboBox11 + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_comboBox12 + 1 + + + protected + 1 + + Resizable + -1 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + Combo! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textRxInput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 5 + wxEXPAND + 1 + + wxID_ANY + File I/O + + sbSizer11 + wxHORIZONTAL + none + + + 5 + wxEXPAND + 0 + + + bSizer38 + wxVERTICAL + none + + 5 + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + File Only + + 0 + + + 0 + + 1 + m_radioBtnFileOnly + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizer45 + wxVERTICAL + none + + + + 5 + wxEXPAND + 1 + + + bSizer46 + wxVERTICAL + none + - - 6 - wxEXPAND - 1 - + + + Settings + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY - Tx Output + + 0 + + + 0 - sbSizer7 - wxVERTICAL - none + 1 + m_panelSettings + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + - - 5 - wxEXPAND - 1 - - - bSizer281 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_lbTxOutput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnTxOutputSelect - - - - - - - - - - - - - - + + + bSizer27 + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bSizer271 + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + wxID_ANY + Rx Input + + sbSizer6 + wxVERTICAL + none + + + 6 + wxEXPAND + 1 + + + bSizer31 + wxVERTICAL + none + + 2 + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_lbRxInput + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_HSCROLL|wxLB_SINGLE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + OnRxInputSelect + + + + + + + + + + + + + + + + + + 2 + wxALIGN_CENTER|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textRxInput + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textCtrl15 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 6 + wxEXPAND + 1 + + wxID_ANY + Tx Output + + sbSizer7 + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + bSizer281 + wxVERTICAL + none + + 2 + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_lbTxOutput + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_HSCROLL|wxLB_SINGLE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + OnTxOutputSelect + + + + + + + + + + + + + + + + + + 2 + wxALIGN_CENTER|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textCtrl15 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - 1 - wxEXPAND - 1 - - - bSizer26 - wxHORIZONTAL - none - - 6 - wxEXPAND - 1 - - wxID_ANY - Voice Input - - sbSizer8 - wxVERTICAL - none - - - 5 - wxEXPAND - 1 - - - bSizer29 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_lbVoiceInput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnVoiceInputSelect - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textVoiceInput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 1 + wxEXPAND + 1 + + + bSizer26 + wxHORIZONTAL + none + + 6 + wxEXPAND + 1 + + wxID_ANY + Voice Input + + sbSizer8 + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + bSizer29 + wxVERTICAL + none + + 2 + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_lbVoiceInput + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_HSCROLL|wxLB_SINGLE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + OnVoiceInputSelect + + + + + + + + + + + + + + + + + + 2 + wxALIGN_CENTER|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textVoiceInput + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + wxEXPAND + 1 + + wxID_ANY + Voice Output + + sbSizer9 + wxVERTICAL + none + + + 1 + wxEXPAND + 1 + + + bSizer30 + wxVERTICAL + none + + 2 + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_lbVoiceOutput + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_HSCROLL|wxLB_SINGLE + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + OnVoiceOutputSelect + + + + + + + + + + + + + + + + + + 2 + wxALIGN_CENTER|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textVoiceOutput + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - 6 - wxEXPAND - 1 - + + + Right Channel + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 wxID_ANY - Voice Output + + 0 + + + 0 - sbSizer9 - wxVERTICAL - none + 1 + m_panelRightChannel + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + - - 1 - wxEXPAND - 1 - - - bSizer30 - wxVERTICAL - none - - 2 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_lbVoiceOutput - 1 - - - protected - 1 - - Resizable - 1 - - wxLB_HSCROLL|wxLB_SINGLE - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - OnVoiceOutputSelect - - - - - - - - - - - - - - - - - - 2 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - 0 - - 0 - - 1 - m_textVoiceOutput - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + bSizer36 + wxVERTICAL + none @@ -3357,6 +4714,16 @@ + + 5 + wxEXPAND + 0 + + 15 + protected + 0 + + diff --git a/fdmdv2/Release/fdmdv2.exe b/fdmdv2/Release/fdmdv2.exe index 250c31e8..d311d9d8 100644 Binary files a/fdmdv2/Release/fdmdv2.exe and b/fdmdv2/Release/fdmdv2.exe differ diff --git a/fdmdv2/dlg_audio.cpp b/fdmdv2/dlg_audio.cpp index 48413749..1062fddf 100644 --- a/fdmdv2/dlg_audio.cpp +++ b/fdmdv2/dlg_audio.cpp @@ -67,23 +67,12 @@ void AudioDlg::populateStandardSampleRates( const portaudio::DirectionSpecificStreamParameters &inputParameters, const portaudio::DirectionSpecificStreamParameters &outputParameters) { - static double STANDARD_SAMPLE_RATES[] = { - 8000.0, - 9600.0, - 11025.0, - 12000.0, - 16000.0, - 22050.0, - 24000.0, - 32000.0, - 44100.0, - 48000.0, - 88200.0, - 96000.0, - 192000.0, - -1 - }; // negative terminated list - + static double STANDARD_SAMPLE_RATES[] = { + 8000.0, 9600.0, 11025.0, 12000.0, + 16000.0, 22050.0, 24000.0, 32000.0, + 44100.0, 48000.0, 88200.0, 96000.0, + -1 // negative terminated list + }; int printCount = 0; wxString tStr; @@ -92,37 +81,16 @@ void AudioDlg::populateStandardSampleRates( portaudio::StreamParameters tmp = portaudio::StreamParameters(inputParameters, outputParameters, STANDARD_SAMPLE_RATES[i], 0, paNoFlag); if (tmp.isSupported()) { - tStr.Printf("%8.2f", STANDARD_SAMPLE_RATES[i]); - if (printCount == 0) - { - target->InsertItems(1, &tStr, 0); - printCount = 1; - } - else if (printCount == 4) - { - target->InsertItems(1, &tStr, 0); - printCount = 1; - } - else - { - target->InsertItems(1, &tStr, 0); - ++printCount; - } + tStr.Printf("%i %8.2f", printCount, STANDARD_SAMPLE_RATES[i]); + target->InsertItems(1, &tStr, 0); + ++printCount; } } if (printCount == 0) { - //std::cout << "None" << std::endl; tStr = "None\n"; target->InsertItems(1, &tStr, 0); } - -/* - else - { - std::cout << std::endl; - } -*/ } int AudioDlg::populateAudioInfo() @@ -258,33 +226,27 @@ int AudioDlg::populateAudioInfo() m_lbVoiceInput->InsertItems(1, &tStr, 0); populateStandardSampleRates(m_lbVoiceInput, inputParameters, outputParameters); } -// tStr.Printf("---------------------------------\n"); -// m_textTopRight->AppendText(tStr); } } catch (const portaudio::PaException &e) { tStr.Printf("A PortAudio error occured: %s\n", e.paErrorText()); wxMessageBox(tStr, wxT("Portaudio exception"), wxOK); -// m_textTopRight->AppendText(tStr); } catch (const portaudio::PaCppException &e) { tStr.Printf("A PortAudioCpp error occured: %s\n", e.what()); wxMessageBox(tStr, wxT("PortAudioCpp error"), wxOK); - //m_textTopRight->AppendText(tStr); } catch (const std::exception &e) { tStr.Printf("A generic exception occured: %s\n", e.what()); wxMessageBox(tStr, wxT("Generic Exception"), wxOK); -// m_textTopRight->AppendText(tStr); } catch (...) { tStr.Printf("An unknown exception occured.\n"); wxMessageBox(tStr, wxT("Unknown error"), wxOK); -// m_textTopRight->AppendText(tStr); } return 0; } diff --git a/fdmdv2/fdmdv2.mk b/fdmdv2/fdmdv2.mk index e41ba711..5cba256e 100644 --- a/fdmdv2/fdmdv2.mk +++ b/fdmdv2/fdmdv2.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=wittend -Date :=5/29/2012 +Date :=5/30/2012 CodeLitePath :="C:\Program Files\CodeLite" LinkerName :=g++ ArchiveTool :=ar rcus diff --git a/fdmdv2/topFrame.cpp b/fdmdv2/topFrame.cpp index 59c9df27..30db3808 100644 --- a/fdmdv2/topFrame.cpp +++ b/fdmdv2/topFrame.cpp @@ -420,6 +420,109 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + wxBoxSizer* bSizer32; + bSizer32 = new wxBoxSizer( wxVERTICAL ); + + m_nbAudioOptions = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_panelDevices = new wxPanel( m_nbAudioOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* bSizer34; + bSizer34 = new wxBoxSizer( wxVERTICAL ); + + wxStaticBoxSizer* sbSizer10; + sbSizer10 = new wxStaticBoxSizer( new wxStaticBox( m_panelDevices, wxID_ANY, _("PortAudio") ), wxVERTICAL ); + + wxBoxSizer* bSizer41; + bSizer41 = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bSizer37; + bSizer37 = new wxBoxSizer( wxVERTICAL ); + + m_radioBtnPortAudio = new wxRadioButton( m_panelDevices, wxID_ANY, _("PortAudio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_radioBtnPortAudio->SetValue( true ); + bSizer37->Add( m_radioBtnPortAudio, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + bSizer41->Add( bSizer37, 0, wxEXPAND, 5 ); + + wxGridSizer* gSizer7; + gSizer7 = new wxGridSizer( 4, 1, 0, 0 ); + + m_staticText14 = new wxStaticText( m_panelDevices, wxID_ANY, _("Audio in (mic) -> codec:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_staticText14->Wrap( -1 ); + gSizer7->Add( m_staticText14, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + m_staticText15 = new wxStaticText( m_panelDevices, wxID_ANY, _("codec -> Radio Tx: "), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_staticText15->Wrap( -1 ); + gSizer7->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); + + m_staticText16 = new wxStaticText( m_panelDevices, wxID_ANY, _("Radio Rx -> codec:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_staticText16->Wrap( -1 ); + gSizer7->Add( m_staticText16, 0, wxALIGN_RIGHT|wxALL, 5 ); + + m_staticText17 = new wxStaticText( m_panelDevices, wxID_ANY, _("codec -> Audio out (spkr):"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_staticText17->Wrap( -1 ); + gSizer7->Add( m_staticText17, 0, wxALIGN_RIGHT|wxALL, 5 ); + + + bSizer41->Add( gSizer7, 1, wxEXPAND, 5 ); + + wxGridSizer* gSizer5; + gSizer5 = new wxGridSizer( 4, 1, 0, 0 ); + + m_comboBox1 = new wxComboBox( m_panelDevices, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + gSizer5->Add( m_comboBox1, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + m_comboBox2 = new wxComboBox( m_panelDevices, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + gSizer5->Add( m_comboBox2, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + m_comboBox11 = new wxComboBox( m_panelDevices, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + gSizer5->Add( m_comboBox11, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + m_comboBox12 = new wxComboBox( m_panelDevices, wxID_ANY, _("Combo!"), wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); + gSizer5->Add( m_comboBox12, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); + + + bSizer41->Add( gSizer5, 1, wxEXPAND, 5 ); + + + sbSizer10->Add( bSizer41, 1, wxEXPAND, 5 ); + + + bSizer34->Add( sbSizer10, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* sbSizer11; + sbSizer11 = new wxStaticBoxSizer( new wxStaticBox( m_panelDevices, wxID_ANY, _("File I/O") ), wxHORIZONTAL ); + + wxBoxSizer* bSizer38; + bSizer38 = new wxBoxSizer( wxVERTICAL ); + + m_radioBtnFileOnly = new wxRadioButton( m_panelDevices, wxID_ANY, _("File Only"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + bSizer38->Add( m_radioBtnFileOnly, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + sbSizer11->Add( bSizer38, 0, wxEXPAND, 5 ); + + wxBoxSizer* bSizer45; + bSizer45 = new wxBoxSizer( wxVERTICAL ); + + + sbSizer11->Add( bSizer45, 1, wxEXPAND, 5 ); + + wxBoxSizer* bSizer46; + bSizer46 = new wxBoxSizer( wxVERTICAL ); + + + sbSizer11->Add( bSizer46, 1, wxEXPAND, 5 ); + + + bSizer34->Add( sbSizer11, 1, wxEXPAND, 5 ); + + + m_panelDevices->SetSizer( bSizer34 ); + m_panelDevices->Layout(); + bSizer34->Fit( m_panelDevices ); + m_nbAudioOptions->AddPage( m_panelDevices, _("Devices"), true ); + m_panelSettings = new wxPanel( m_nbAudioOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer27; bSizer27 = new wxBoxSizer( wxVERTICAL ); @@ -427,15 +530,15 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer271 = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* sbSizer6; - sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Rx Input") ), wxVERTICAL ); + sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Rx Input") ), wxVERTICAL ); wxBoxSizer* bSizer31; bSizer31 = new wxBoxSizer( wxVERTICAL ); - m_lbRxInput = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); + m_lbRxInput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); bSizer31->Add( m_lbRxInput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 ); - m_textRxInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textRxInput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer31->Add( m_textRxInput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 ); @@ -445,15 +548,15 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer271->Add( sbSizer6, 1, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer7; - sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Tx Output") ), wxVERTICAL ); + sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Tx Output") ), wxVERTICAL ); wxBoxSizer* bSizer281; bSizer281 = new wxBoxSizer( wxVERTICAL ); - m_lbTxOutput = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); + m_lbTxOutput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); bSizer281->Add( m_lbTxOutput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 ); - m_textCtrl15 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrl15 = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer281->Add( m_textCtrl15, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 ); @@ -469,15 +572,15 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer26 = new wxBoxSizer( wxHORIZONTAL ); wxStaticBoxSizer* sbSizer8; - sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Voice Input") ), wxVERTICAL ); + sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Voice Input") ), wxVERTICAL ); wxBoxSizer* bSizer29; bSizer29 = new wxBoxSizer( wxVERTICAL ); - m_lbVoiceInput = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); + m_lbVoiceInput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); bSizer29->Add( m_lbVoiceInput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 ); - m_textVoiceInput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textVoiceInput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer29->Add( m_textVoiceInput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 ); @@ -487,15 +590,15 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer26->Add( sbSizer8, 1, wxEXPAND, 6 ); wxStaticBoxSizer* sbSizer9; - sbSizer9 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Voice Output") ), wxVERTICAL ); + sbSizer9 = new wxStaticBoxSizer( new wxStaticBox( m_panelSettings, wxID_ANY, _("Voice Output") ), wxVERTICAL ); wxBoxSizer* bSizer30; bSizer30 = new wxBoxSizer( wxVERTICAL ); - m_lbVoiceOutput = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); + m_lbVoiceOutput = new wxListBox( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_SINGLE ); bSizer30->Add( m_lbVoiceOutput, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 2 ); - m_textVoiceOutput = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_textVoiceOutput = new wxTextCtrl( m_panelSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer30->Add( m_textVoiceOutput, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 2 ); @@ -507,6 +610,23 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer27->Add( bSizer26, 1, wxEXPAND, 1 ); + + m_panelSettings->SetSizer( bSizer27 ); + m_panelSettings->Layout(); + bSizer27->Fit( m_panelSettings ); + m_nbAudioOptions->AddPage( m_panelSettings, _("Settings"), false ); + m_panelRightChannel = new wxPanel( m_nbAudioOptions, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxBoxSizer* bSizer36; + bSizer36 = new wxBoxSizer( wxVERTICAL ); + + + m_panelRightChannel->SetSizer( bSizer36 ); + m_panelRightChannel->Layout(); + bSizer36->Fit( m_panelRightChannel ); + m_nbAudioOptions->AddPage( m_panelRightChannel, _("Right Channel"), false ); + + bSizer32->Add( m_nbAudioOptions, 1, wxEXPAND | wxALL, 1 ); + wxBoxSizer* bSizer28; bSizer28 = new wxBoxSizer( wxVERTICAL ); @@ -522,10 +642,13 @@ DlgAudio::DlgAudio( wxWindow* parent, wxWindowID id, const wxString& title, cons bSizer28->Add( m_sdbSizer3, 1, wxEXPAND, 5 ); - bSizer27->Add( bSizer28, 0, wxEXPAND, 5 ); + bSizer32->Add( bSizer28, 0, wxEXPAND, 5 ); + + + bSizer32->Add( 0, 15, 0, wxEXPAND, 5 ); - this->SetSizer( bSizer27 ); + this->SetSizer( bSizer32 ); this->Layout(); this->Centre( wxBOTH ); diff --git a/fdmdv2/topFrame.h b/fdmdv2/topFrame.h index 5fd295c9..28e05a19 100644 --- a/fdmdv2/topFrame.h +++ b/fdmdv2/topFrame.h @@ -34,7 +34,11 @@ #include #include #include +#include +#include +#include #include +#include #include /////////////////////////////////////////////////////////////////////////// @@ -158,6 +162,19 @@ class DlgAudio : public wxDialog private: protected: + wxNotebook* m_nbAudioOptions; + wxPanel* m_panelDevices; + wxRadioButton* m_radioBtnPortAudio; + wxStaticText* m_staticText14; + wxStaticText* m_staticText15; + wxStaticText* m_staticText16; + wxStaticText* m_staticText17; + wxComboBox* m_comboBox1; + wxComboBox* m_comboBox2; + wxComboBox* m_comboBox11; + wxComboBox* m_comboBox12; + wxRadioButton* m_radioBtnFileOnly; + wxPanel* m_panelSettings; wxListBox* m_lbRxInput; wxTextCtrl* m_textRxInput; wxListBox* m_lbTxOutput; @@ -166,6 +183,7 @@ class DlgAudio : public wxDialog wxTextCtrl* m_textVoiceInput; wxListBox* m_lbVoiceOutput; wxTextCtrl* m_textVoiceOutput; + wxPanel* m_panelRightChannel; wxStdDialogButtonSizer* m_sdbSizer3; wxButton* m_sdbSizer3OK; wxButton* m_sdbSizer3Apply; @@ -185,7 +203,7 @@ class DlgAudio : public wxDialog public: - DlgAudio( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 553,455 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DlgAudio( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Audio Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 553,381 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DlgAudio(); }; diff --git a/fdmdv2/topFrame.py b/fdmdv2/topFrame.py index e8685fd7..658ef40d 100644 --- a/fdmdv2/topFrame.py +++ b/fdmdv2/topFrame.py @@ -475,23 +475,119 @@ class DlgAbout ( wx.Dialog ): class DlgAudio ( wx.Dialog ): def __init__( self, parent ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Audio Options"), pos = wx.DefaultPosition, size = wx.Size( 553,455 ), style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER ) + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Audio Options"), pos = wx.DefaultPosition, size = wx.Size( 553,381 ), style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER ) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + bSizer32 = wx.BoxSizer( wx.VERTICAL ) + + self.m_nbAudioOptions = wx.Notebook( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_panelDevices = wx.Panel( self.m_nbAudioOptions, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + bSizer34 = wx.BoxSizer( wx.VERTICAL ) + + sbSizer10 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelDevices, wx.ID_ANY, _(u"PortAudio") ), wx.VERTICAL ) + + bSizer41 = wx.BoxSizer( wx.HORIZONTAL ) + + bSizer37 = wx.BoxSizer( wx.VERTICAL ) + + self.m_radioBtnPortAudio = wx.RadioButton( self.m_panelDevices, wx.ID_ANY, _(u"PortAudio"), wx.DefaultPosition, wx.DefaultSize, wx.RB_GROUP ) + self.m_radioBtnPortAudio.SetValue( True ) + bSizer37.Add( self.m_radioBtnPortAudio, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + + bSizer41.Add( bSizer37, 0, wx.EXPAND, 5 ) + + gSizer7 = wx.GridSizer( 4, 1, 0, 0 ) + + self.m_staticText14 = wx.StaticText( self.m_panelDevices, wx.ID_ANY, _(u"Audio in (mic) -> codec:"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) + self.m_staticText14.Wrap( -1 ) + gSizer7.Add( self.m_staticText14, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) + + self.m_staticText15 = wx.StaticText( self.m_panelDevices, wx.ID_ANY, _(u"codec -> Radio Tx: "), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) + self.m_staticText15.Wrap( -1 ) + gSizer7.Add( self.m_staticText15, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) + + self.m_staticText16 = wx.StaticText( self.m_panelDevices, wx.ID_ANY, _(u"Radio Rx -> codec:"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) + self.m_staticText16.Wrap( -1 ) + gSizer7.Add( self.m_staticText16, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + + self.m_staticText17 = wx.StaticText( self.m_panelDevices, wx.ID_ANY, _(u"codec -> Audio out (spkr):"), wx.DefaultPosition, wx.DefaultSize, wx.ALIGN_RIGHT ) + self.m_staticText17.Wrap( -1 ) + gSizer7.Add( self.m_staticText17, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + + + bSizer41.Add( gSizer7, 1, wx.EXPAND, 5 ) + + gSizer5 = wx.GridSizer( 4, 1, 0, 0 ) + + m_comboBox1Choices = [] + self.m_comboBox1 = wx.ComboBox( self.m_panelDevices, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox1Choices, 0 ) + gSizer5.Add( self.m_comboBox1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + m_comboBox2Choices = [] + self.m_comboBox2 = wx.ComboBox( self.m_panelDevices, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox2Choices, 0 ) + gSizer5.Add( self.m_comboBox2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + m_comboBox11Choices = [] + self.m_comboBox11 = wx.ComboBox( self.m_panelDevices, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox11Choices, 0 ) + gSizer5.Add( self.m_comboBox11, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + m_comboBox12Choices = [] + self.m_comboBox12 = wx.ComboBox( self.m_panelDevices, wx.ID_ANY, _(u"Combo!"), wx.DefaultPosition, wx.DefaultSize, m_comboBox12Choices, 0 ) + gSizer5.Add( self.m_comboBox12, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + + + bSizer41.Add( gSizer5, 1, wx.EXPAND, 5 ) + + + sbSizer10.Add( bSizer41, 1, wx.EXPAND, 5 ) + + + bSizer34.Add( sbSizer10, 1, wx.EXPAND, 5 ) + + sbSizer11 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelDevices, wx.ID_ANY, _(u"File I/O") ), wx.HORIZONTAL ) + + bSizer38 = wx.BoxSizer( wx.VERTICAL ) + + self.m_radioBtnFileOnly = wx.RadioButton( self.m_panelDevices, wx.ID_ANY, _(u"File Only"), wx.DefaultPosition, wx.DefaultSize, wx.RB_GROUP ) + bSizer38.Add( self.m_radioBtnFileOnly, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + + + sbSizer11.Add( bSizer38, 0, wx.EXPAND, 5 ) + + bSizer45 = wx.BoxSizer( wx.VERTICAL ) + + + sbSizer11.Add( bSizer45, 1, wx.EXPAND, 5 ) + + bSizer46 = wx.BoxSizer( wx.VERTICAL ) + + + sbSizer11.Add( bSizer46, 1, wx.EXPAND, 5 ) + + + bSizer34.Add( sbSizer11, 1, wx.EXPAND, 5 ) + + + self.m_panelDevices.SetSizer( bSizer34 ) + self.m_panelDevices.Layout() + bSizer34.Fit( self.m_panelDevices ) + self.m_nbAudioOptions.AddPage( self.m_panelDevices, _(u"Devices"), True ) + self.m_panelSettings = wx.Panel( self.m_nbAudioOptions, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) bSizer27 = wx.BoxSizer( wx.VERTICAL ) bSizer271 = wx.BoxSizer( wx.HORIZONTAL ) - sbSizer6 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Rx Input") ), wx.VERTICAL ) + sbSizer6 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelSettings, wx.ID_ANY, _(u"Rx Input") ), wx.VERTICAL ) bSizer31 = wx.BoxSizer( wx.VERTICAL ) m_lbRxInputChoices = [] - self.m_lbRxInput = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbRxInputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) + self.m_lbRxInput = wx.ListBox( self.m_panelSettings, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbRxInputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) bSizer31.Add( self.m_lbRxInput, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL|wx.EXPAND, 2 ) - self.m_textRxInput = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_textRxInput = wx.TextCtrl( self.m_panelSettings, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer31.Add( self.m_textRxInput, 0, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 2 ) @@ -500,15 +596,15 @@ class DlgAudio ( wx.Dialog ): bSizer271.Add( sbSizer6, 1, wx.EXPAND, 5 ) - sbSizer7 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Tx Output") ), wx.VERTICAL ) + sbSizer7 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelSettings, wx.ID_ANY, _(u"Tx Output") ), wx.VERTICAL ) bSizer281 = wx.BoxSizer( wx.VERTICAL ) m_lbTxOutputChoices = [] - self.m_lbTxOutput = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbTxOutputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) + self.m_lbTxOutput = wx.ListBox( self.m_panelSettings, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbTxOutputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) bSizer281.Add( self.m_lbTxOutput, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL|wx.EXPAND, 2 ) - self.m_textCtrl15 = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_textCtrl15 = wx.TextCtrl( self.m_panelSettings, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer281.Add( self.m_textCtrl15, 0, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 2 ) @@ -522,15 +618,15 @@ class DlgAudio ( wx.Dialog ): bSizer26 = wx.BoxSizer( wx.HORIZONTAL ) - sbSizer8 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Voice Input") ), wx.VERTICAL ) + sbSizer8 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelSettings, wx.ID_ANY, _(u"Voice Input") ), wx.VERTICAL ) bSizer29 = wx.BoxSizer( wx.VERTICAL ) m_lbVoiceInputChoices = [] - self.m_lbVoiceInput = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbVoiceInputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) + self.m_lbVoiceInput = wx.ListBox( self.m_panelSettings, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbVoiceInputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) bSizer29.Add( self.m_lbVoiceInput, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL|wx.EXPAND, 2 ) - self.m_textVoiceInput = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_textVoiceInput = wx.TextCtrl( self.m_panelSettings, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer29.Add( self.m_textVoiceInput, 0, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 2 ) @@ -539,15 +635,15 @@ class DlgAudio ( wx.Dialog ): bSizer26.Add( sbSizer8, 1, wx.EXPAND, 6 ) - sbSizer9 = wx.StaticBoxSizer( wx.StaticBox( self, wx.ID_ANY, _(u"Voice Output") ), wx.VERTICAL ) + sbSizer9 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelSettings, wx.ID_ANY, _(u"Voice Output") ), wx.VERTICAL ) bSizer30 = wx.BoxSizer( wx.VERTICAL ) m_lbVoiceOutputChoices = [] - self.m_lbVoiceOutput = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbVoiceOutputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) + self.m_lbVoiceOutput = wx.ListBox( self.m_panelSettings, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, m_lbVoiceOutputChoices, wx.LB_HSCROLL|wx.LB_SINGLE ) bSizer30.Add( self.m_lbVoiceOutput, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALL|wx.EXPAND, 2 ) - self.m_textVoiceOutput = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_textVoiceOutput = wx.TextCtrl( self.m_panelSettings, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer30.Add( self.m_textVoiceOutput, 0, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 2 ) @@ -559,6 +655,22 @@ class DlgAudio ( wx.Dialog ): bSizer27.Add( bSizer26, 1, wx.EXPAND, 1 ) + + self.m_panelSettings.SetSizer( bSizer27 ) + self.m_panelSettings.Layout() + bSizer27.Fit( self.m_panelSettings ) + self.m_nbAudioOptions.AddPage( self.m_panelSettings, _(u"Settings"), False ) + self.m_panelRightChannel = wx.Panel( self.m_nbAudioOptions, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + bSizer36 = wx.BoxSizer( wx.VERTICAL ) + + + self.m_panelRightChannel.SetSizer( bSizer36 ) + self.m_panelRightChannel.Layout() + bSizer36.Fit( self.m_panelRightChannel ) + self.m_nbAudioOptions.AddPage( self.m_panelRightChannel, _(u"Right Channel"), False ) + + bSizer32.Add( self.m_nbAudioOptions, 1, wx.EXPAND |wx.ALL, 1 ) + bSizer28 = wx.BoxSizer( wx.VERTICAL ) m_sdbSizer3 = wx.StdDialogButtonSizer() @@ -573,10 +685,13 @@ class DlgAudio ( wx.Dialog ): bSizer28.Add( m_sdbSizer3, 1, wx.EXPAND, 5 ) - bSizer27.Add( bSizer28, 0, wx.EXPAND, 5 ) + bSizer32.Add( bSizer28, 0, wx.EXPAND, 5 ) + + + bSizer32.AddSpacer( ( 0, 15), 0, wx.EXPAND, 5 ) - self.SetSizer( bSizer27 ) + self.SetSizer( bSizer32 ) self.Layout() self.Centre( wx.BOTH ) diff --git a/fdmdv2/topFrame.xrc b/fdmdv2/topFrame.xrc index 81c9e2a8..5702aa2a 100644 --- a/fdmdv2/topFrame.xrc +++ b/fdmdv2/topFrame.xrc @@ -445,162 +445,375 @@ - 553,455 + 553,381 Audio Options 1 wxVERTICAL - wxEXPAND - 5 - - wxHORIZONTAL - - - wxEXPAND - 5 - - wxVERTICAL - - - - wxEXPAND - 6 - - wxVERTICAL - - - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 2 - - - + wxEXPAND | wxALL + 1 + + + + 1 + + + + wxVERTICAL + + + wxEXPAND + 5 + + wxVERTICAL + + + + wxEXPAND + 5 + + wxHORIZONTAL + + + wxEXPAND + 5 + + wxVERTICAL + + + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL + 5 + + + + 1 + + + + + + + wxEXPAND + 5 + + 4 + 1 + 0 + 0 + + + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 5 + + + + -1 + + + + + wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL + 5 + + + + -1 + + + + + wxALIGN_RIGHT|wxALL + 5 + + + + -1 + + + + + wxALIGN_RIGHT|wxALL + 5 + + + + -1 + + + + + + + wxEXPAND + 5 + + 4 + 1 + 0 + 0 + + + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 5 + + Combo! + + + + + + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 5 + + Combo! + + + + + + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 5 + + Combo! + + + + + + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 5 + + Combo! + + + + + + - - - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - - 0 + + + + wxEXPAND + 5 + + wxHORIZONTAL + + + + wxEXPAND + 5 + + wxVERTICAL + + + wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL + 5 + + + + 0 + + + + + + + wxEXPAND + 5 + + wxVERTICAL + + + + + wxEXPAND + 5 + + wxVERTICAL + - - - wxEXPAND - 6 - - wxVERTICAL - - - - wxEXPAND - 5 - - wxVERTICAL - - - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 2 - - - + + + 0 + + + + wxVERTICAL + + + wxEXPAND + 5 + + wxHORIZONTAL + + + wxEXPAND + 5 + + wxVERTICAL + + + + wxEXPAND + 6 + + wxVERTICAL + + + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 2 + + + + + + + + wxALIGN_CENTER|wxALL|wxEXPAND + 2 + + + 0 + + + + + - - - - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - - 0 + + + wxEXPAND + 6 + + wxVERTICAL + + + + wxEXPAND + 5 + + wxVERTICAL + + + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 2 + + + + + + + + wxALIGN_CENTER|wxALL|wxEXPAND + 2 + + + 0 + + + + + - - - - - - - - wxEXPAND - 1 - - wxHORIZONTAL - - - wxEXPAND - 6 - - wxVERTICAL - - - - wxEXPAND - 5 - - wxVERTICAL - - - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 2 - - - + + + wxEXPAND + 1 + + wxHORIZONTAL + + + wxEXPAND + 6 + + wxVERTICAL + + + + wxEXPAND + 5 + + wxVERTICAL + + + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 2 + + + + + + + + wxALIGN_CENTER|wxALL|wxEXPAND + 2 + + + 0 + + + + + - - - - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - - 0 + + + wxEXPAND + 6 + + wxVERTICAL + + + + wxEXPAND + 1 + + wxVERTICAL + + + wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + 2 + + + + + + + + wxALIGN_CENTER|wxALL|wxEXPAND + 2 + + + 0 + + + + + - - - wxEXPAND - 6 - - wxVERTICAL - - - - wxEXPAND - 1 - - wxVERTICAL - - - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND - 2 - - - - - - - - wxALIGN_CENTER|wxALL|wxEXPAND - 2 - - - 0 - - - + + + 0 + + + + wxVERTICAL @@ -642,6 +855,12 @@ + + + wxEXPAND + 5 + 0,15 +