From: wittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 15 Aug 2012 02:31:28 +0000 (+0000)
Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@612 01035d8c-6547-0410-b346-abe4f9... 
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=42be4c5a40d495cbe754a2c7703c7f198d002ee2;p=freetel-svn-tracking.git

git-svn-id: https://svn.code.sf.net/p/freetel/code@612 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/fdmdv2/Debug/fdmdv2.exe b/fdmdv2/Debug/fdmdv2.exe
index 2db1f910..65cd0cca 100644
Binary files a/fdmdv2/Debug/fdmdv2.exe and b/fdmdv2/Debug/fdmdv2.exe differ
diff --git a/fdmdv2/dlg_audio.h b/fdmdv2/dlg_audio.h
index f20510c0..d994d6bb 100644
--- a/fdmdv2/dlg_audio.h
+++ b/fdmdv2/dlg_audio.h
@@ -23,7 +23,7 @@
 
 class AudioDlg : public DlgAudio
 {
-    protected:
+     protected:
         // Handlers for DlgAudio events.
         void OnCancel( wxCommandEvent& event );
         void OnOK( wxCommandEvent& event );
diff --git a/fdmdv2/fdmdv2.mk b/fdmdv2/fdmdv2.mk
index 9808dda8..94f1fe27 100644
--- a/fdmdv2/fdmdv2.mk
+++ b/fdmdv2/fdmdv2.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=wittend
-Date                   :=6/18/2012
+Date                   :=8/13/2012
 CodeLitePath           :="C:\Program Files\CodeLite"
 LinkerName             :=g++
 ArchiveTool            :=ar rcus
diff --git a/fdmdv2/fdmdv2.project b/fdmdv2/fdmdv2.project
index f22252ce..b2a6e6f8 100644
--- a/fdmdv2/fdmdv2.project
+++ b/fdmdv2/fdmdv2.project
@@ -72,7 +72,8 @@
     </GlobalSettings>
     <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" C_Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
-        <IncludePath Value="./extern/include"/>
+        <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
+        <IncludePath Value="../codec2-dev/src"/>
         <Preprocessor Value="__WX__"/>
       </Compiler>
       <Linker Options="-mwindows;$(shell wx-config --debug=yes --libs --unicode=yes)" Required="yes">
@@ -128,7 +129,7 @@
         <Library Value="libportaudiocpp.a"/>
       </Linker>
       <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
-      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
+      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
diff --git a/fdmdv2/fdmdv2.workspace b/fdmdv2/fdmdv2.workspace
index 7e9ff586..1b5ac0d5 100644
--- a/fdmdv2/fdmdv2.workspace
+++ b/fdmdv2/fdmdv2.workspace
@@ -10,8 +10,9 @@
   <Environment>
     <![CDATA[]]>
   </Environment>
+  <Project Name="fltk_fdmdv2" Path="fltk_fdmdv2/fltk_fdmdv2.project" Active="No"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Debug" Selected="yes">
+    <WorkspaceConfiguration Name="Debug" Selected="no">
       <Project Name="test_sndfile" ConfigName="Debug"/>
       <Project Name="test_portaudio" ConfigName="Debug"/>
       <Project Name="test_codec2" ConfigName="Debug"/>
@@ -22,18 +23,19 @@
       <Project Name="pa_cppbinding_test" ConfigName="Debug"/>
       <Project Name="fdmdv2basic" ConfigName="Debug"/>
       <Project Name="pa_enum" ConfigName="Debug"/>
+      <Project Name="fltk_fdmdv2" ConfigName="Debug"/>
+      <Project Name="fltk_fdmdv2" ConfigName="Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Release" Selected="no">
-      <Project Name="test_sndfile" ConfigName="Release"/>
-      <Project Name="test_portaudio" ConfigName="Release"/>
-      <Project Name="test_codec2" ConfigName="Release"/>
-      <Project Name="test_hamlib" ConfigName="Release"/>
-      <Project Name="librs232" ConfigName="Release"/>
+    <WorkspaceConfiguration Name="Release" Selected="yes">
       <Project Name="fdmdv2" ConfigName="Release"/>
-      <Project Name="pa_test" ConfigName="Release"/>
-      <Project Name="pa_cppbinding_test" ConfigName="Release"/>
       <Project Name="fdmdv2basic" ConfigName="Release"/>
+      <Project Name="pa_cppbinding_test" ConfigName="Release"/>
       <Project Name="pa_enum" ConfigName="Release"/>
+      <Project Name="pa_test" ConfigName="Release"/>
+      <Project Name="test_hamlib" ConfigName="Release"/>
+      <Project Name="test_sndfile" ConfigName="Release"/>
+      <Project Name="fltk_fdmdv2" ConfigName="Release"/>
+      <Project Name="fltk_fdmdv2" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>
diff --git a/fdmdv2/fdmdv2_plot.cpp b/fdmdv2/fdmdv2_plot.cpp
index 61c45b88..0eaaea7e 100644
--- a/fdmdv2/fdmdv2_plot.cpp
+++ b/fdmdv2/fdmdv2_plot.cpp
@@ -25,6 +25,7 @@ DrawPanel::DrawPanel(wxFrame* parent) : wxPanel(parent)
 {
     m_clip              = false;
     m_bitmap            = true;
+    m_zoomFactor        = 1.0;
     m_rubberBand        = false;
     m_mouseDown         = false;
     m_penShortDash      = wxPen(wxColor(0xA0, 0xA0, 0xA0), 1, wxPENSTYLE_SHORT_DASH);
@@ -108,6 +109,26 @@ void DrawPanel::OnMouseUp(wxMouseEvent& event)
     m_mouseDown = false;
 }
 
+//-------------------------------------------------------------------------
+// SetZoomFactor()
+//-------------------------------------------------------------------------
+double DrawPanel::SetZoomFactor(double zf)
+{
+    if((zf > 0) && (zf < 5.0))
+    {
+        m_zoomFactor = zf;
+    }
+    return zf;
+}
+
+//-------------------------------------------------------------------------
+// GetZoomFactor()
+//-------------------------------------------------------------------------
+double DrawPanel::GetZoomFactor(double zf)
+{
+    return m_zoomFactor;
+}
+
 #define PLOT_BORDER         10
 #define XLEFT_OFFSET        0
 #define YBOTTOM_OFFSET      25
diff --git a/fdmdv2/fdmdv2_plot.h b/fdmdv2/fdmdv2_plot.h
index 2ba0a7b3..52022e36 100644
--- a/fdmdv2/fdmdv2_plot.h
+++ b/fdmdv2/fdmdv2_plot.h
@@ -38,6 +38,8 @@ class DrawPanel : public wxPanel
         void OnClose( wxCloseEvent& event ){ event.Skip(); }
         void OnSize( wxSizeEvent& event );
         void OnErase(wxEraseEvent& event);
+        double SetZoomFactor(double zf);
+        double GetZoomFactor(double zf);
         //void OnUpdateUI( wxUpdateUIEvent& event ){ event.Skip(); }
         void OnShow(wxShowEvent& event);
 
@@ -46,6 +48,7 @@ class DrawPanel : public wxPanel
         bool m_clip;
         bool m_rubberBand;
         bool m_mouseDown;
+        double m_zoomFactor;
     DECLARE_EVENT_TABLE()
 };
 #endif //__FDMDV2_PLOT__
diff --git a/fdmdv2/fdmdv2_wsp.mk b/fdmdv2/fdmdv2_wsp.mk
index ccef4887..634b38f9 100644
--- a/fdmdv2/fdmdv2_wsp.mk
+++ b/fdmdv2/fdmdv2_wsp.mk
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-	@echo ----------Building project:[ pa_enum - Debug ]----------
+	@echo ----------Building project:[ pa_enum - Release ]----------
 	@cd "pa_enum" && "mingw32-make.exe"  -j 2 -f "pa_enum.mk"
 clean:
-	@echo ----------Cleaning project:[ pa_enum - Debug ]----------
+	@echo ----------Cleaning project:[ pa_enum - Release ]----------
 	@cd "pa_enum" && "mingw32-make.exe"  -j 2 -f "pa_enum.mk" clean
diff --git a/fdmdv2/fdmdv2basic/fdmdv2basic.project b/fdmdv2/fdmdv2basic/fdmdv2basic.project
index 13f6c19b..bce8cecc 100644
--- a/fdmdv2/fdmdv2basic/fdmdv2basic.project
+++ b/fdmdv2/fdmdv2basic/fdmdv2basic.project
@@ -111,4 +111,6 @@
       </Completion>
     </Configuration>
   </Settings>
+  <Dependencies Name="Debug"/>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>
diff --git a/fdmdv2/pa_enum/Debug/pa_enum.exe b/fdmdv2/pa_enum/Debug/pa_enum.exe
index f796ee48..f2c76996 100644
Binary files a/fdmdv2/pa_enum/Debug/pa_enum.exe and b/fdmdv2/pa_enum/Debug/pa_enum.exe differ
diff --git a/fdmdv2/pa_enum/Release/pa_enum.exe b/fdmdv2/pa_enum/Release/pa_enum.exe
index 358271d6..f38b510e 100644
Binary files a/fdmdv2/pa_enum/Release/pa_enum.exe and b/fdmdv2/pa_enum/Release/pa_enum.exe differ
diff --git a/fdmdv2/pa_enum/gui.cpp b/fdmdv2/pa_enum/gui.cpp
index 9d72359f..35cbda2b 100644
--- a/fdmdv2/pa_enum/gui.cpp
+++ b/fdmdv2/pa_enum/gui.cpp
@@ -13,16 +13,6 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
 	
-	m_menuBar = new wxMenuBar( 0 );
-	m_menuFile = new wxMenu();
-	wxMenuItem* menuFileExit;
-	menuFileExit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+X"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( menuFileExit );
-	
-	m_menuBar->Append( m_menuFile, _("&File") ); 
-	
-	this->SetMenuBar( m_menuBar );
-	
 	wxBoxSizer* mainSizer;
 	mainSizer = new wxBoxSizer( wxVERTICAL );
 	
@@ -42,7 +32,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_panelRx, wxID_ANY, _("Rx Radio Device") ), wxVERTICAL );
 	
 	m_listCtrlRxInDevices = new wxListCtrl( m_panelRx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );
-	sbSizer2->Add( m_listCtrlRxInDevices, 1, wxALL|wxEXPAND, 2 );
+	sbSizer2->Add( m_listCtrlRxInDevices, 1, wxALL|wxEXPAND, 1 );
 	
 	wxBoxSizer* bSizer811;
 	bSizer811 = new wxBoxSizer( wxHORIZONTAL );
@@ -52,14 +42,14 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	bSizer811->Add( m_staticText51, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
 	
 	m_textCtrlRxIn = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer811->Add( m_textCtrlRxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	bSizer811->Add( m_textCtrlRxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );
 	
 	m_staticText6 = new wxStaticText( m_panelRx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText6->Wrap( -1 );
 	bSizer811->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
 	
 	m_cbSampleRateRxIn = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); 
-	bSizer811->Add( m_cbSampleRateRxIn, 0, wxALL, 5 );
+	bSizer811->Add( m_cbSampleRateRxIn, 0, wxALL, 1 );
 	
 	
 	sbSizer2->Add( bSizer811, 0, wxEXPAND, 5 );
@@ -71,7 +61,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelRx, wxID_ANY, _("Rx Speaker Stream") ), wxVERTICAL );
 	
 	m_listCtrlRxOutDevices = new wxListCtrl( m_panelRx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );
-	sbSizer3->Add( m_listCtrlRxOutDevices, 1, wxALL|wxEXPAND, 2 );
+	sbSizer3->Add( m_listCtrlRxOutDevices, 1, wxALL|wxEXPAND, 1 );
 	
 	wxBoxSizer* bSizer81;
 	bSizer81 = new wxBoxSizer( wxHORIZONTAL );
@@ -81,14 +71,14 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	bSizer81->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	m_textRxOut = new wxTextCtrl( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer81->Add( m_textRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	bSizer81->Add( m_textRxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );
 	
 	m_staticText10 = new wxStaticText( m_panelRx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText10->Wrap( -1 );
 	bSizer81->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
 	
 	m_cbSampleRateRxOut = new wxComboBox( m_panelRx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); 
-	bSizer81->Add( m_cbSampleRateRxOut, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	bSizer81->Add( m_cbSampleRateRxOut, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1 );
 	
 	
 	sbSizer3->Add( bSizer81, 0, wxEXPAND, 2 );
@@ -115,7 +105,7 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	sbSizer22 = new wxStaticBoxSizer( new wxStaticBox( m_panelTx, wxID_ANY, _("Tx Microphone Stream") ), wxVERTICAL );
 	
 	m_listCtrlTxInDevices = new wxListCtrl( m_panelTx, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_VRULES );
-	sbSizer22->Add( m_listCtrlTxInDevices, 1, wxALL|wxEXPAND, 2 );
+	sbSizer22->Add( m_listCtrlTxInDevices, 1, wxALL|wxEXPAND, 1 );
 	
 	wxBoxSizer* bSizer83;
 	bSizer83 = new wxBoxSizer( wxHORIZONTAL );
@@ -125,14 +115,14 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	bSizer83->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
 	
 	m_textCtrlTxIn = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer83->Add( m_textCtrlTxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	bSizer83->Add( m_textCtrlTxIn, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );
 	
 	m_staticText11 = new wxStaticText( m_panelTx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText11->Wrap( -1 );
 	bSizer83->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
 	
 	m_cbSampleRateTxIn = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); 
-	bSizer83->Add( m_cbSampleRateTxIn, 0, wxALL, 5 );
+	bSizer83->Add( m_cbSampleRateTxIn, 0, wxALL, 1 );
 	
 	
 	sbSizer22->Add( bSizer83, 0, wxEXPAND, 2 );
@@ -154,14 +144,14 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	bSizer82->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	m_textCtrTxOut = new wxTextCtrl( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer82->Add( m_textCtrTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+	bSizer82->Add( m_textCtrTxOut, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1 );
 	
 	m_staticText71 = new wxStaticText( m_panelTx, wxID_ANY, _("Sample Rate:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText71->Wrap( -1 );
 	bSizer82->Add( m_staticText71, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 );
 	
 	m_cbSampleRateTxOut = new wxComboBox( m_panelTx, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); 
-	bSizer82->Add( m_cbSampleRateTxOut, 0, wxALL, 5 );
+	bSizer82->Add( m_cbSampleRateTxOut, 0, wxALL, 1 );
 	
 	
 	sbSizer21->Add( bSizer82, 0, wxEXPAND, 2 );
@@ -304,7 +294,6 @@ MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& t
 	// Connect Events
 	this->Connect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );
-	this->Connect( menuFileExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) );
 	m_listCtrlRxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxInDeviceSelect ), NULL, this );
 	m_listCtrlRxOutDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxOutDeviceSelect ), NULL, this );
 	m_listCtrlTxInDevices->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnTxInDeviceSelect ), NULL, this );
@@ -320,7 +309,6 @@ MainFrameBase::~MainFrameBase()
 	// Disconnect Events
 	this->Disconnect( wxEVT_ACTIVATE_APP, wxActivateEventHandler( MainFrameBase::OnActivateApp ) );
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnCloseFrame ) );
-	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnExitClick ) );
 	m_listCtrlRxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxInDeviceSelect ), NULL, this );
 	m_listCtrlRxOutDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnRxOutDeviceSelect ), NULL, this );
 	m_listCtrlTxInDevices->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( MainFrameBase::OnTxInDeviceSelect ), NULL, this );
diff --git a/fdmdv2/pa_enum/gui.fbp b/fdmdv2/pa_enum/gui.fbp
index 6bcfd736..4f69c823 100644
--- a/fdmdv2/pa_enum/gui.fbp
+++ b/fdmdv2/pa_enum/gui.fbp
@@ -71,7 +71,7 @@
             <property name="pos"></property>
             <property name="resize">Resizable</property>
             <property name="show">1</property>
-            <property name="size">869,417</property>
+            <property name="size">790,400</property>
             <property name="style">wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass"></property>
             <property name="title">PortAudio Device Enumeration</property>
@@ -120,107 +120,6 @@
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
             <event name="OnUpdateUI"></event>
-            <object class="wxMenuBar" expanded="1">
-                <property name="BottomDockable">1</property>
-                <property name="LeftDockable">1</property>
-                <property name="RightDockable">1</property>
-                <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
-                <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></property>
-                <property name="best_size"></property>
-                <property name="bg"></property>
-                <property name="caption"></property>
-                <property name="caption_visible">1</property>
-                <property name="center_pane">0</property>
-                <property name="close_button">1</property>
-                <property name="context_help"></property>
-                <property name="context_menu">1</property>
-                <property name="default_pane">0</property>
-                <property name="dock">Dock</property>
-                <property name="dock_fixed">0</property>
-                <property name="docking">Left</property>
-                <property name="enabled">1</property>
-                <property name="fg"></property>
-                <property name="floatable">1</property>
-                <property name="font"></property>
-                <property name="gripper">0</property>
-                <property name="hidden">0</property>
-                <property name="id">wxID_ANY</property>
-                <property name="label">MainMenu</property>
-                <property name="max_size"></property>
-                <property name="maximize_button">0</property>
-                <property name="maximum_size"></property>
-                <property name="min_size"></property>
-                <property name="minimize_button">0</property>
-                <property name="minimum_size"></property>
-                <property name="moveable">1</property>
-                <property name="name">m_menuBar</property>
-                <property name="pane_border">1</property>
-                <property name="pane_position"></property>
-                <property name="pane_size"></property>
-                <property name="permission">protected</property>
-                <property name="pin_button">1</property>
-                <property name="pos"></property>
-                <property name="resize">Resizable</property>
-                <property name="show">1</property>
-                <property name="size"></property>
-                <property name="style"></property>
-                <property name="subclass"></property>
-                <property name="toolbar_pane">0</property>
-                <property name="tooltip"></property>
-                <property name="validator_data_type"></property>
-                <property name="validator_style">wxFILTER_NONE</property>
-                <property name="validator_type">wxDefaultValidator</property>
-                <property name="validator_variable"></property>
-                <property name="window_extra_style"></property>
-                <property name="window_name"></property>
-                <property name="window_style"></property>
-                <event name="OnChar"></event>
-                <event name="OnEnterWindow"></event>
-                <event name="OnEraseBackground"></event>
-                <event name="OnKeyDown"></event>
-                <event name="OnKeyUp"></event>
-                <event name="OnKillFocus"></event>
-                <event name="OnLeaveWindow"></event>
-                <event name="OnLeftDClick"></event>
-                <event name="OnLeftDown"></event>
-                <event name="OnLeftUp"></event>
-                <event name="OnMiddleDClick"></event>
-                <event name="OnMiddleDown"></event>
-                <event name="OnMiddleUp"></event>
-                <event name="OnMotion"></event>
-                <event name="OnMouseEvents"></event>
-                <event name="OnMouseWheel"></event>
-                <event name="OnPaint"></event>
-                <event name="OnRightDClick"></event>
-                <event name="OnRightDown"></event>
-                <event name="OnRightUp"></event>
-                <event name="OnSetFocus"></event>
-                <event name="OnSize"></event>
-                <event name="OnUpdateUI"></event>
-                <object class="wxMenu" expanded="1">
-                    <property name="label">&amp;File</property>
-                    <property name="name">m_menuFile</property>
-                    <property name="permission">protected</property>
-                    <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help"></property>
-                        <property name="id">wxID_EXIT</property>
-                        <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">E&amp;xit</property>
-                        <property name="name">menuFileExit</property>
-                        <property name="permission">none</property>
-                        <property name="shortcut">Alt+X</property>
-                        <property name="unchecked_bitmap"></property>
-                        <event name="OnMenuSelection">OnExitClick</event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
-            </object>
             <object class="wxBoxSizer" expanded="1">
                 <property name="minimum_size"></property>
                 <property name="name">mainSizer</property>
@@ -511,7 +410,7 @@
                                                                 <property name="permission">none</property>
                                                                 <event name="OnUpdateUI"></event>
                                                                 <object class="sizeritem" expanded="0">
-                                                                    <property name="border">2</property>
+                                                                    <property name="border">1</property>
                                                                     <property name="flag">wxALL|wxEXPAND</property>
                                                                     <property name="proportion">1</property>
                                                                     <object class="wxListCtrl" expanded="0">
@@ -530,7 +429,7 @@
                                                                         <property name="center_pane">0</property>
                                                                         <property name="close_button">1</property>
                                                                         <property name="context_help"></property>
-                                                                        <property name="context_menu">1</property>
+                                                                        <property name="context_menu">0</property>
                                                                         <property name="default_pane">0</property>
                                                                         <property name="dock">Dock</property>
                                                                         <property name="dock_fixed">0</property>
@@ -712,7 +611,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="0">
-                                                                            <property name="border">2</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                                             <property name="proportion">1</property>
                                                                             <object class="wxTextCtrl" expanded="0">
@@ -890,7 +789,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="1">
-                                                                            <property name="border">5</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALL</property>
                                                                             <property name="proportion">0</property>
                                                                             <object class="wxComboBox" expanded="1">
@@ -997,7 +896,7 @@
                                                                 <property name="permission">none</property>
                                                                 <event name="OnUpdateUI"></event>
                                                                 <object class="sizeritem" expanded="0">
-                                                                    <property name="border">2</property>
+                                                                    <property name="border">1</property>
                                                                     <property name="flag">wxALL|wxEXPAND</property>
                                                                     <property name="proportion">1</property>
                                                                     <object class="wxListCtrl" expanded="0">
@@ -1198,7 +1097,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="0">
-                                                                            <property name="border">2</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                                             <property name="proportion">1</property>
                                                                             <object class="wxTextCtrl" expanded="0">
@@ -1376,7 +1275,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="1">
-                                                                            <property name="border">5</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                                             <property name="proportion">0</property>
                                                                             <object class="wxComboBox" expanded="1">
@@ -1587,7 +1486,7 @@
                                                                 <property name="permission">none</property>
                                                                 <event name="OnUpdateUI"></event>
                                                                 <object class="sizeritem" expanded="0">
-                                                                    <property name="border">2</property>
+                                                                    <property name="border">1</property>
                                                                     <property name="flag">wxALL|wxEXPAND</property>
                                                                     <property name="proportion">1</property>
                                                                     <object class="wxListCtrl" expanded="0">
@@ -1788,7 +1687,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="0">
-                                                                            <property name="border">2</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                                             <property name="proportion">1</property>
                                                                             <object class="wxTextCtrl" expanded="0">
@@ -1966,7 +1865,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="1">
-                                                                            <property name="border">5</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALL</property>
                                                                             <property name="proportion">0</property>
                                                                             <object class="wxComboBox" expanded="1">
@@ -2274,7 +2173,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="0">
-                                                                            <property name="border">2</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                                                                             <property name="proportion">1</property>
                                                                             <object class="wxTextCtrl" expanded="0">
@@ -2452,7 +2351,7 @@
                                                                             </object>
                                                                         </object>
                                                                         <object class="sizeritem" expanded="1">
-                                                                            <property name="border">5</property>
+                                                                            <property name="border">1</property>
                                                                             <property name="flag">wxALL</property>
                                                                             <property name="proportion">0</property>
                                                                             <object class="wxComboBox" expanded="1">
diff --git a/fdmdv2/pa_enum/gui.h b/fdmdv2/pa_enum/gui.h
index b46e0111..d296ef6e 100644
--- a/fdmdv2/pa_enum/gui.h
+++ b/fdmdv2/pa_enum/gui.h
@@ -11,22 +11,21 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
+#include <wx/listctrl.h>
 #include <wx/string.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/menu.h>
 #include <wx/gdicmn.h>
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
-#include <wx/listctrl.h>
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/combobox.h>
 #include <wx/sizer.h>
 #include <wx/statbox.h>
 #include <wx/panel.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
 #include <wx/notebook.h>
 #include <wx/button.h>
 #include <wx/frame.h>
@@ -42,8 +41,6 @@ class MainFrameBase : public wxFrame
 	private:
 	
 	protected:
-		wxMenuBar* m_menuBar;
-		wxMenu* m_menuFile;
 		wxPanel* m_panel1;
 		wxNotebook* m_notebook1;
 		wxPanel* m_panelRx;
@@ -86,7 +83,6 @@ class MainFrameBase : public wxFrame
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnActivateApp( wxActivateEvent& event ) { event.Skip(); }
 		virtual void OnCloseFrame( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnExitClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRxInDeviceSelect( wxListEvent& event ) { event.Skip(); }
 		virtual void OnRxOutDeviceSelect( wxListEvent& event ) { event.Skip(); }
 		virtual void OnTxInDeviceSelect( wxListEvent& event ) { event.Skip(); }
@@ -99,7 +95,7 @@ class MainFrameBase : public wxFrame
 	
 	public:
 		
-		MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PortAudio Device Enumeration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 869,417 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
+		MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PortAudio Device Enumeration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 790,400 ), long style = wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		
 		~MainFrameBase();
 	
diff --git a/fdmdv2/pa_enum/gui.py b/fdmdv2/pa_enum/gui.py
index 0fb8ccb6..507c4ee5 100644
--- a/fdmdv2/pa_enum/gui.py
+++ b/fdmdv2/pa_enum/gui.py
@@ -20,19 +20,10 @@ _ = gettext.gettext
 class MainFrameBase ( wx.Frame ):
 	
 	def __init__( self, parent ):
-		wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"PortAudio Device Enumeration"), pos = wx.DefaultPosition, size = wx.Size( 869,417 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )
+		wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"PortAudio Device Enumeration"), pos = wx.DefaultPosition, size = wx.Size( 790,400 ), style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.RESIZE_BORDER|wx.TAB_TRAVERSAL )
 		
 		self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )
 		
-		self.m_menuBar = wx.MenuBar( 0 )
-		self.m_menuFile = wx.Menu()
-		self.menuFileExit = wx.MenuItem( self.m_menuFile, wx.ID_EXIT, _(u"E&xit")+ u"\t" + u"Alt+X", wx.EmptyString, wx.ITEM_NORMAL )
-		self.m_menuFile.AppendItem( self.menuFileExit )
-		
-		self.m_menuBar.Append( self.m_menuFile, _(u"&File") ) 
-		
-		self.SetMenuBar( self.m_menuBar )
-		
 		mainSizer = wx.BoxSizer( wx.VERTICAL )
 		
 		self.m_panel1 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
@@ -47,7 +38,7 @@ class MainFrameBase ( wx.Frame ):
 		sbSizer2 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelRx, wx.ID_ANY, _(u"Rx Radio Device") ), wx.VERTICAL )
 		
 		self.m_listCtrlRxInDevices = wx.ListCtrl( self.m_panelRx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES )
-		sbSizer2.Add( self.m_listCtrlRxInDevices, 1, wx.ALL|wx.EXPAND, 2 )
+		sbSizer2.Add( self.m_listCtrlRxInDevices, 1, wx.ALL|wx.EXPAND, 1 )
 		
 		bSizer811 = wx.BoxSizer( wx.HORIZONTAL )
 		
@@ -56,7 +47,7 @@ class MainFrameBase ( wx.Frame ):
 		bSizer811.Add( self.m_staticText51, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 )
 		
 		self.m_textCtrlRxIn = wx.TextCtrl( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-		bSizer811.Add( self.m_textCtrlRxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 2 )
+		bSizer811.Add( self.m_textCtrlRxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 )
 		
 		self.m_staticText6 = wx.StaticText( self.m_panelRx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 )
 		self.m_staticText6.Wrap( -1 )
@@ -64,7 +55,7 @@ class MainFrameBase ( wx.Frame ):
 		
 		m_cbSampleRateRxInChoices = []
 		self.m_cbSampleRateRxIn = wx.ComboBox( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateRxInChoices, wx.CB_DROPDOWN )
-		bSizer811.Add( self.m_cbSampleRateRxIn, 0, wx.ALL, 5 )
+		bSizer811.Add( self.m_cbSampleRateRxIn, 0, wx.ALL, 1 )
 		
 		
 		sbSizer2.Add( bSizer811, 0, wx.EXPAND, 5 )
@@ -75,7 +66,7 @@ class MainFrameBase ( wx.Frame ):
 		sbSizer3 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelRx, wx.ID_ANY, _(u"Rx Speaker Stream") ), wx.VERTICAL )
 		
 		self.m_listCtrlRxOutDevices = wx.ListCtrl( self.m_panelRx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES )
-		sbSizer3.Add( self.m_listCtrlRxOutDevices, 1, wx.ALL|wx.EXPAND, 2 )
+		sbSizer3.Add( self.m_listCtrlRxOutDevices, 1, wx.ALL|wx.EXPAND, 1 )
 		
 		bSizer81 = wx.BoxSizer( wx.HORIZONTAL )
 		
@@ -84,7 +75,7 @@ class MainFrameBase ( wx.Frame ):
 		bSizer81.Add( self.m_staticText9, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
 		
 		self.m_textRxOut = wx.TextCtrl( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-		bSizer81.Add( self.m_textRxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 2 )
+		bSizer81.Add( self.m_textRxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 )
 		
 		self.m_staticText10 = wx.StaticText( self.m_panelRx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 )
 		self.m_staticText10.Wrap( -1 )
@@ -92,7 +83,7 @@ class MainFrameBase ( wx.Frame ):
 		
 		m_cbSampleRateRxOutChoices = []
 		self.m_cbSampleRateRxOut = wx.ComboBox( self.m_panelRx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateRxOutChoices, wx.CB_DROPDOWN )
-		bSizer81.Add( self.m_cbSampleRateRxOut, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
+		bSizer81.Add( self.m_cbSampleRateRxOut, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 )
 		
 		
 		sbSizer3.Add( bSizer81, 0, wx.EXPAND, 2 )
@@ -116,7 +107,7 @@ class MainFrameBase ( wx.Frame ):
 		sbSizer22 = wx.StaticBoxSizer( wx.StaticBox( self.m_panelTx, wx.ID_ANY, _(u"Tx Microphone Stream") ), wx.VERTICAL )
 		
 		self.m_listCtrlTxInDevices = wx.ListCtrl( self.m_panelTx, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LC_HRULES|wx.LC_REPORT|wx.LC_VRULES )
-		sbSizer22.Add( self.m_listCtrlTxInDevices, 1, wx.ALL|wx.EXPAND, 2 )
+		sbSizer22.Add( self.m_listCtrlTxInDevices, 1, wx.ALL|wx.EXPAND, 1 )
 		
 		bSizer83 = wx.BoxSizer( wx.HORIZONTAL )
 		
@@ -125,7 +116,7 @@ class MainFrameBase ( wx.Frame ):
 		bSizer83.Add( self.m_staticText12, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 )
 		
 		self.m_textCtrlTxIn = wx.TextCtrl( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-		bSizer83.Add( self.m_textCtrlTxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 2 )
+		bSizer83.Add( self.m_textCtrlTxIn, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 )
 		
 		self.m_staticText11 = wx.StaticText( self.m_panelTx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 )
 		self.m_staticText11.Wrap( -1 )
@@ -133,7 +124,7 @@ class MainFrameBase ( wx.Frame ):
 		
 		m_cbSampleRateTxInChoices = []
 		self.m_cbSampleRateTxIn = wx.ComboBox( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateTxInChoices, wx.CB_DROPDOWN )
-		bSizer83.Add( self.m_cbSampleRateTxIn, 0, wx.ALL, 5 )
+		bSizer83.Add( self.m_cbSampleRateTxIn, 0, wx.ALL, 1 )
 		
 		
 		sbSizer22.Add( bSizer83, 0, wx.EXPAND, 2 )
@@ -153,7 +144,7 @@ class MainFrameBase ( wx.Frame ):
 		bSizer82.Add( self.m_staticText81, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 )
 		
 		self.m_textCtrTxOut = wx.TextCtrl( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
-		bSizer82.Add( self.m_textCtrTxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 2 )
+		bSizer82.Add( self.m_textCtrTxOut, 1, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 1 )
 		
 		self.m_staticText71 = wx.StaticText( self.m_panelTx, wx.ID_ANY, _(u"Sample Rate:"), wx.DefaultPosition, wx.DefaultSize, 0 )
 		self.m_staticText71.Wrap( -1 )
@@ -161,7 +152,7 @@ class MainFrameBase ( wx.Frame ):
 		
 		m_cbSampleRateTxOutChoices = []
 		self.m_cbSampleRateTxOut = wx.ComboBox( self.m_panelTx, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, m_cbSampleRateTxOutChoices, wx.CB_DROPDOWN )
-		bSizer82.Add( self.m_cbSampleRateTxOut, 0, wx.ALL, 5 )
+		bSizer82.Add( self.m_cbSampleRateTxOut, 0, wx.ALL, 1 )
 		
 		
 		sbSizer21.Add( bSizer82, 0, wx.EXPAND, 2 )
@@ -294,7 +285,6 @@ class MainFrameBase ( wx.Frame ):
 		# Connect Events
 		self.Bind( wx.EVT_ACTIVATE_APP, self.OnActivateApp )
 		self.Bind( wx.EVT_CLOSE, self.OnCloseFrame )
-		self.Bind( wx.EVT_MENU, self.OnExitClick, id = self.menuFileExit.GetId() )
 		self.m_listCtrlRxInDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnRxInDeviceSelect )
 		self.m_listCtrlRxOutDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnRxOutDeviceSelect )
 		self.m_listCtrlTxInDevices.Bind( wx.EVT_LIST_ITEM_SELECTED, self.OnTxInDeviceSelect )
@@ -315,9 +305,6 @@ class MainFrameBase ( wx.Frame ):
 	def OnCloseFrame( self, event ):
 		event.Skip()
 	
-	def OnExitClick( self, event ):
-		event.Skip()
-	
 	def OnRxInDeviceSelect( self, event ):
 		event.Skip()
 	
diff --git a/fdmdv2/pa_enum/gui.xrc b/fdmdv2/pa_enum/gui.xrc
index 7aaedc83..f8b101ec 100644
--- a/fdmdv2/pa_enum/gui.xrc
+++ b/fdmdv2/pa_enum/gui.xrc
@@ -2,20 +2,10 @@
 <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
 	<object class="wxFrame" name="MainFrameBase">
 		<style>wxCLOSE_BOX|wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxTAB_TRAVERSAL</style>
-		<size>869,417</size>
+		<size>790,400</size>
 		<title>PortAudio Device Enumeration</title>
 		<centered>1</centered>
 		<aui_managed>0</aui_managed>
-		<object class="wxMenuBar" name="m_menuBar">
-			<label>MainMenu</label>
-			<object class="wxMenu" name="m_menuFile">
-				<label>_File</label>
-				<object class="wxMenuItem" name="menuFileExit">
-					<label>E_xit\tAlt+X</label>
-					<help></help>
-				</object>
-			</object>
-		</object>
 		<object class="wxBoxSizer">
 			<orient>wxVERTICAL</orient>
 			<object class="sizeritem">
@@ -58,7 +48,7 @@
 															<object class="sizeritem">
 																<option>1</option>
 																<flag>wxALL|wxEXPAND</flag>
-																<border>2</border>
+																<border>1</border>
 																<object class="wxListCtrl" name="m_listCtrlRxInDevices">
 																	<style>wxLC_HRULES|wxLC_REPORT|wxLC_VRULES</style>
 																</object>
@@ -81,7 +71,7 @@
 																	<object class="sizeritem">
 																		<option>1</option>
 																		<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-																		<border>2</border>
+																		<border>1</border>
 																		<object class="wxTextCtrl" name="m_textCtrlRxIn">
 																			<value></value>
 																			<maxlength>0</maxlength>
@@ -99,7 +89,7 @@
 																	<object class="sizeritem">
 																		<option>0</option>
 																		<flag>wxALL</flag>
-																		<border>5</border>
+																		<border>1</border>
 																		<object class="wxComboBox" name="m_cbSampleRateRxIn">
 																			<style>wxCB_DROPDOWN</style>
 																			<value></value>
@@ -120,7 +110,7 @@
 															<object class="sizeritem">
 																<option>1</option>
 																<flag>wxALL|wxEXPAND</flag>
-																<border>2</border>
+																<border>1</border>
 																<object class="wxListCtrl" name="m_listCtrlRxOutDevices">
 																	<style>wxLC_HRULES|wxLC_REPORT|wxLC_VRULES</style>
 																</object>
@@ -143,7 +133,7 @@
 																	<object class="sizeritem">
 																		<option>1</option>
 																		<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-																		<border>2</border>
+																		<border>1</border>
 																		<object class="wxTextCtrl" name="m_textRxOut">
 																			<value></value>
 																			<maxlength>0</maxlength>
@@ -161,7 +151,7 @@
 																	<object class="sizeritem">
 																		<option>0</option>
 																		<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-																		<border>5</border>
+																		<border>1</border>
 																		<object class="wxComboBox" name="m_cbSampleRateRxOut">
 																			<style>wxCB_DROPDOWN</style>
 																			<value></value>
@@ -203,7 +193,7 @@
 															<object class="sizeritem">
 																<option>1</option>
 																<flag>wxALL|wxEXPAND</flag>
-																<border>2</border>
+																<border>1</border>
 																<object class="wxListCtrl" name="m_listCtrlTxInDevices">
 																	<style>wxLC_HRULES|wxLC_REPORT|wxLC_VRULES</style>
 																</object>
@@ -226,7 +216,7 @@
 																	<object class="sizeritem">
 																		<option>1</option>
 																		<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-																		<border>2</border>
+																		<border>1</border>
 																		<object class="wxTextCtrl" name="m_textCtrlTxIn">
 																			<value></value>
 																			<maxlength>0</maxlength>
@@ -244,7 +234,7 @@
 																	<object class="sizeritem">
 																		<option>0</option>
 																		<flag>wxALL</flag>
-																		<border>5</border>
+																		<border>1</border>
 																		<object class="wxComboBox" name="m_cbSampleRateTxIn">
 																			<style>wxCB_DROPDOWN</style>
 																			<value></value>
@@ -288,7 +278,7 @@
 																	<object class="sizeritem">
 																		<option>1</option>
 																		<flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-																		<border>2</border>
+																		<border>1</border>
 																		<object class="wxTextCtrl" name="m_textCtrTxOut">
 																			<value></value>
 																			<maxlength>0</maxlength>
@@ -306,7 +296,7 @@
 																	<object class="sizeritem">
 																		<option>0</option>
 																		<flag>wxALL</flag>
-																		<border>5</border>
+																		<border>1</border>
 																		<object class="wxComboBox" name="m_cbSampleRateTxOut">
 																			<style>wxCB_DROPDOWN</style>
 																			<value></value>
diff --git a/fdmdv2/pa_enum/main.cpp b/fdmdv2/pa_enum/main.cpp
index 25a50ef2..68455e83 100644
--- a/fdmdv2/pa_enum/main.cpp
+++ b/fdmdv2/pa_enum/main.cpp
@@ -76,10 +76,30 @@ MainFrame::MainFrame(wxWindow *parent) : MainFrameBase(parent)
     }
     m_notebook1->SetSelection(0);
     showAPIInfo();
-    populateParams(m_listCtrlRxInDevices,  AUDIO_IN);
-    populateParams(m_listCtrlRxOutDevices, AUDIO_OUT);
-    populateParams(m_listCtrlTxInDevices,  AUDIO_IN);
-    populateParams(m_listCtrlTxOutDevices, AUDIO_OUT);
+    m_RxInDevices.m_listDevices   = m_listCtrlRxInDevices;
+    m_RxInDevices.direction       = AUDIO_IN;
+    m_RxInDevices.m_textDevice    = m_textCtrlRxIn;
+    m_RxInDevices.m_cbSampleRate  = m_cbSampleRateRxIn;
+
+    m_RxOutDevices.m_listDevices  = m_listCtrlRxOutDevices;
+    m_RxOutDevices.direction      = AUDIO_OUT;
+    m_RxOutDevices.m_textDevice   = m_textRxOut;
+    m_RxOutDevices.m_cbSampleRate = m_cbSampleRateRxOut;
+
+    m_TxInDevices.m_listDevices   = m_listCtrlTxInDevices;
+    m_TxInDevices.direction       = AUDIO_IN;
+    m_TxInDevices.m_textDevice    = m_textCtrlTxIn;
+    m_TxInDevices.m_cbSampleRate  = m_cbSampleRateTxIn;
+
+    m_TxOutDevices.m_listDevices  = m_listCtrlTxOutDevices;
+    m_TxOutDevices.direction      = AUDIO_OUT;
+    m_TxOutDevices.m_textDevice   = m_textCtrTxOut;
+    m_TxOutDevices.m_cbSampleRate = m_cbSampleRateTxOut;
+
+    populateParams(m_RxInDevices);
+    populateParams(m_RxOutDevices);
+    populateParams(m_TxInDevices);
+    populateParams(m_TxOutDevices);
 }
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
@@ -219,10 +239,10 @@ void MainFrame::OnRefreshClick(wxCommandEvent& event)
 {
     m_notebook1->SetSelection(0);
     showAPIInfo();
-    populateParams(m_listCtrlRxInDevices,  AUDIO_IN);
-    populateParams(m_listCtrlRxOutDevices, AUDIO_OUT);
-    populateParams(m_listCtrlTxInDevices,  AUDIO_IN);
-    populateParams(m_listCtrlTxOutDevices, AUDIO_OUT);
+    populateParams(m_RxInDevices);
+    populateParams(m_RxOutDevices);
+    populateParams(m_TxInDevices);
+    populateParams(m_TxOutDevices);
 }
 
 //-------------------------------------------------------------------------
@@ -253,14 +273,20 @@ void MainFrame::showAPIInfo()
 //-------------------------------------------------------------------------
 // populateParams()
 //-------------------------------------------------------------------------
-void MainFrame::populateParams(wxListCtrl* ctrl, int in_out)
+void MainFrame::populateParams(AudioInfoDisplay ai)    //wxListCtrl* ctrl, int in_out)
 {
-    int         numDevices       = 0;
-    int         defaultDisplayed = false;
     const       PaDeviceInfo *deviceInfo = NULL;
+    int         j                        = 0;
+    wxListCtrl* ctrl                     = ai.m_listDevices;
+    int         in_out                   = ai.direction;
+    //wxTextCtrl* txtCtrl                  = ai.m_textDevice;
+    //wxComboBox* cb                       = ai.m_cbSampleRate;
+    long        idx;
+    int         defaultDisplayed;
+    int         numDevices;
     wxListItem  listItem;
     wxString    buf;
-    int         j = 0;
+    int         devn;
 
     numDevices = Pa_GetDeviceCount();
 
@@ -272,146 +298,132 @@ void MainFrame::populateParams(wxListCtrl* ctrl, int in_out)
 
     listItem.SetAlign(wxLIST_FORMAT_CENTRE);
     listItem.SetText(wxT("Sel"));
-    ctrl->InsertColumn(0, listItem);
-    ctrl->SetColumnWidth(0, 45);
+    idx = ctrl->InsertColumn(0, listItem);
+    ctrl->SetColumnWidth(0, 37);
 
     listItem.SetAlign(wxLIST_FORMAT_CENTRE);
     listItem.SetText(wxT("Dflt"));
-    ctrl->InsertColumn(1, listItem);
-    ctrl->SetColumnWidth(1, 45);
+    idx = ctrl->InsertColumn(1, listItem);
+    ctrl->SetColumnWidth(1, 37);
 
     listItem.SetAlign(wxLIST_FORMAT_LEFT);
     listItem.SetText(wxT("Device"));
-    ctrl->InsertColumn(2, listItem);
-    ctrl->SetColumnWidth(2, 220);
+    idx = ctrl->InsertColumn(2, listItem);
+    ctrl->SetColumnWidth(2, 190);
 
     listItem.SetAlign(wxLIST_FORMAT_LEFT);
     listItem.SetText(wxT("API"));
-    ctrl->InsertColumn(3, listItem);
-    ctrl->SetColumnWidth(3, 200);
+    idx = ctrl->InsertColumn(3, listItem);
+    ctrl->SetColumnWidth(3, 190);
 
     if(in_out == AUDIO_IN)
     {
         listItem.SetAlign(wxLIST_FORMAT_CENTRE);
         listItem.SetText(wxT("# Inputs"));
-        ctrl->InsertColumn(4, listItem);
-        ctrl->SetColumnWidth(4, 85);
-
+        idx = ctrl->InsertColumn(4, listItem);
+        ctrl->SetColumnWidth(4, 75);
+    }
+    else if(in_out == AUDIO_OUT)
+    {
         listItem.SetAlign(wxLIST_FORMAT_CENTRE);
-        listItem.SetText(wxT("Min Latency"));
-        ctrl->InsertColumn(5, listItem);
-        ctrl->SetColumnWidth(5, 120);
+        listItem.SetText(wxT("# Outputs"));
+        idx = ctrl->InsertColumn(4, listItem);
+        ctrl->SetColumnWidth(4, 75);
+    }
 
-        listItem.SetAlign(wxLIST_FORMAT_CENTRE);
-        listItem.SetText(wxT("Max Latency"));
-        ctrl->InsertColumn(6, listItem);
-        ctrl->SetColumnWidth(6, 120);
-        for(int i = 0; i < numDevices; i++ )
+    listItem.SetAlign(wxLIST_FORMAT_CENTRE);
+    listItem.SetText(wxT("Min Latency"));
+    ctrl->InsertColumn(5, listItem);
+    ctrl->SetColumnWidth(5, 100);
+
+    listItem.SetAlign(wxLIST_FORMAT_CENTRE);
+    listItem.SetText(wxT("Max Latency"));
+    ctrl->InsertColumn(6, listItem);
+    ctrl->SetColumnWidth(6, 100);
+
+     for(devn = 0; devn < numDevices; devn++)
+    {
+        buf.Printf(wxT(""));
+        deviceInfo = Pa_GetDeviceInfo(devn);
+        if(in_out == AUDIO_IN)
         {
-            buf.Printf(wxT(""));
-            deviceInfo = Pa_GetDeviceInfo(i);
             if(deviceInfo->maxInputChannels > 0)
             {
-                ctrl->InsertItem(j, ICON_CHECK);
-                defaultDisplayed = 0;
-                if(i == Pa_GetDefaultInputDevice())
+                idx = ctrl->InsertItem(j, ICON_TRANSPARENT);
+                defaultDisplayed = false;
+                if(devn == Pa_GetDefaultInputDevice())
                 {
-                    // Default Output
-                    ctrl->SetItem(j, 1, buf, ICON_INARROW);
+                    buf.Printf("->>");
+                    ctrl->SetItem(idx, 1, buf);
                     defaultDisplayed = true;
                 }
-                else if(i == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultInputDevice)
+                else if(devn == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultInputDevice)
                 {
-                    ctrl->SetItem(j, 1, buf, ICON_OUTARROW);
+                    buf.Printf("-->");
+                    ctrl->SetItem(idx, 1, buf);
                     defaultDisplayed = true;
                 }
-                if(!defaultDisplayed)
+                else
                 {
-                    ctrl->SetItem(j, 1, buf, ICON_TRANSPARENT);
+                    buf.Printf("---");
+                    ctrl->SetItem(idx, 1, buf);
                 }
-                ctrl->SetItemData(j, 1);
-
                 buf.Printf(wxT("%s"), deviceInfo->name);
-                ctrl->SetItem(j, 2, buf);
+                ctrl->SetItem(idx, 2, buf);
 
                 buf.Printf(wxT("%s"), Pa_GetHostApiInfo(deviceInfo->hostApi)->name);
-                ctrl->SetItem(j, 3, buf);
+                ctrl->SetItem(idx, 3, buf);
 
                 buf.Printf(wxT("%i"), deviceInfo->maxInputChannels);
-                ctrl->SetItem(j, 4, buf);
+                ctrl->SetItem(idx, 4, buf);
 
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultLowInputLatency);
-                ctrl->SetItem(j, 5, buf);
+                ctrl->SetItem(idx, 5, buf);
 
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultHighInputLatency);
-                ctrl->SetItem(j, 6, buf);
-                j++;
+                ctrl->SetItem(idx, 6, buf);
             }
         }
-    }
-    else if(in_out == AUDIO_OUT)
-    {
-        listItem.SetAlign(wxLIST_FORMAT_CENTRE);
-        listItem.SetText(wxT("# Outputs"));
-        ctrl->InsertColumn(4, listItem);
-        ctrl->SetColumnWidth(4, 85);
-
-        listItem.SetAlign(wxLIST_FORMAT_CENTRE);
-        listItem.SetText(wxT("Min Latency"));
-        ctrl->InsertColumn(5, listItem);
-        ctrl->SetColumnWidth(5, 120);
-
-        listItem.SetAlign(wxLIST_FORMAT_CENTRE);
-        listItem.SetText(wxT("Max Latency"));
-        ctrl->InsertColumn(6, listItem);
-        ctrl->SetColumnWidth(6, 120);
-        for(int i = 0; i < numDevices; i++)
+        else if(in_out == AUDIO_OUT)
         {
-            buf.Printf(wxT(""));
-            deviceInfo = Pa_GetDeviceInfo(i);
-            defaultDisplayed = 0;
             if(deviceInfo->maxOutputChannels > 0)
             {
-                ctrl->InsertItem(j, ICON_CHECK);
-                if(i == Pa_GetDefaultOutputDevice())
+                idx = ctrl->InsertItem(j, ICON_TRANSPARENT);
+                defaultDisplayed = false;
+                if(devn == Pa_GetDefaultOutputDevice())
                 {
-                    // Default Output
-                    ctrl->SetItem(j, 1, buf, ICON_OUTARROW);
+                    buf.Printf("<<-");
+                    ctrl->SetItem(idx, 1, buf);
                     defaultDisplayed = true;
                 }
-                else if(i == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultOutputDevice)
+                else if(devn == Pa_GetHostApiInfo(deviceInfo->hostApi)->defaultOutputDevice)
                 {
-                    ctrl->SetItem(j, 1, buf, ICON_OUTARROW);
+                    buf.Printf("<--");
+                    ctrl->SetItem(idx, 1, buf);
                     defaultDisplayed = true;
                 }
-
-                if(!defaultDisplayed)
+                else
                 {
-                    ctrl->SetItem(j, 1, buf, ICON_TRANSPARENT);
+                    buf.Printf("---");
+                    ctrl->SetItem(idx, 1, buf);
                 }
-                ctrl->SetItemData(j, 1);
-
                 buf.Printf(wxT("%s"), deviceInfo->name);
-                ctrl->SetItem(j, 2, buf);
+                ctrl->SetItem(idx, 2, buf);
 
                 buf.Printf(wxT("%s"), Pa_GetHostApiInfo(deviceInfo->hostApi)->name);
-                ctrl->SetItem(j, 3, buf);
+                ctrl->SetItem(idx, 3, buf);
 
                 buf.Printf(wxT("%i"), deviceInfo->maxOutputChannels);
-                ctrl->SetItem(j, 4, buf);
+                ctrl->SetItem(idx, 4, buf);
 
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultLowOutputLatency);
-                ctrl->SetItem(j, 5, buf);
+                ctrl->SetItem(idx, 5, buf);
 
                 buf.Printf(wxT("%8.4f"), deviceInfo->defaultHighOutputLatency);
-                ctrl->SetItem(j, 6, buf);
-                j++;
+                ctrl->SetItem(idx, 6, buf);
             }
         }
-    }
-    else
-    {
-        // Dun, do what?
+        j++;
     }
 }
 
diff --git a/fdmdv2/pa_enum/main.h b/fdmdv2/pa_enum/main.h
index f916e01b..b962a51d 100644
--- a/fdmdv2/pa_enum/main.h
+++ b/fdmdv2/pa_enum/main.h
@@ -59,13 +59,24 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
 // application class declaration
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
-
 class MainApp : public wxApp
 {
     public:
         virtual bool OnInit();
 };
 
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+// AudioInfoDisplay
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=--=-=-=-=
+class AudioInfoDisplay
+{
+    public:
+        wxListCtrl*     m_listDevices;
+        int             direction;
+        wxTextCtrl*     m_textDevice;
+        wxComboBox*     m_cbSampleRate;
+};
+
 // declare global static function wxGetApp()
 DECLARE_APP(MainApp)
 
@@ -90,9 +101,12 @@ class MainFrame : public MainFrameBase
         void OnExitClick( wxCommandEvent& event );
         void OnRefreshClick( wxCommandEvent& event );
         void DisplaySupportedSampleRates(const PaStreamParameters *inputParameters, const PaStreamParameters *outputParameters);
-        void populateParams(wxListCtrl* ctrl, int in_out);
+        void populateParams(AudioInfoDisplay);
         void showAPIInfo();
+        AudioInfoDisplay m_RxInDevices;
+        AudioInfoDisplay m_RxOutDevices;
+        AudioInfoDisplay m_TxInDevices;
+        AudioInfoDisplay m_TxOutDevices;
 };
 
-
 #endif //__main__
diff --git a/fdmdv2/pa_enum/pa_enum.mk b/fdmdv2/pa_enum/pa_enum.mk
index 144dc9b0..4aca206a 100644
--- a/fdmdv2/pa_enum/pa_enum.mk
+++ b/fdmdv2/pa_enum/pa_enum.mk
@@ -2,10 +2,10 @@
 ## Auto Generated makefile by CodeLite IDE
 ## any manual changes will be erased      
 ##
-## Debug
+## Release
 ProjectName            :=pa_enum
-ConfigurationName      :=Debug
-IntermediateDirectory  :=./Debug
+ConfigurationName      :=Release
+IntermediateDirectory  :=./Release
 OutDir                 := $(IntermediateDirectory)
 WorkspacePath          := "C:\Users\wittend\Projects\Radio\fdmdv2"
 ProjectPath            := "C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum"
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=wittend
-Date                   :=6/26/2012
+Date                   :=8/14/2012
 CodeLitePath           :="C:\Program Files\CodeLite"
 LinkerName             :=g++
 ArchiveTool            :=ar rcus
@@ -38,9 +38,9 @@ PreprocessOnlySwitch   :=-E
 ObjectsFileList        :="C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum\pa_enum.txt"
 PCHCompileFlags        :=
 MakeDirCommand         :=makedir
-CmpOptions             := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors)
-C_CmpOptions           := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors)
-LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)
+CmpOptions             := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
+C_CmpOptions           := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
+LinkOptions            :=  -mwindows -s $(shell wx-config --debug=no --libs --unicode=yes)
 IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW/msys/1.0/local/include 
 IncludePCH             := 
 RcIncludePath          := 
@@ -71,7 +71,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
 	$(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)
 
 $(IntermediateDirectory)/.d:
-	@$(MakeDirCommand) "./Debug"
+	@$(MakeDirCommand) "./Release"
 
 PreBuild:
 
@@ -109,6 +109,6 @@ clean:
 	$(RM) $(IntermediateDirectory)/main$(PreprocessSuffix)
 	$(RM) $(OutputFile)
 	$(RM) $(OutputFile).exe
-	$(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-debug\pa_enum"
+	$(RM) "C:\Users\wittend\Projects\Radio\fdmdv2\.build-release\pa_enum"
 
 
diff --git a/fdmdv2/pa_enum/pa_enum.project b/fdmdv2/pa_enum/pa_enum.project
index d2e6e989..df12bc4d 100644
--- a/fdmdv2/pa_enum/pa_enum.project
+++ b/fdmdv2/pa_enum/pa_enum.project
@@ -18,6 +18,8 @@
   <VirtualDirectory Name="resources">
     <File Name="gui.fbp"/>
   </VirtualDirectory>
+  <Dependencies Name="Debug"/>
+  <Dependencies Name="Release"/>
   <Settings Type="Executable">
     <GlobalSettings>
       <Compiler Options="" C_Options="">
@@ -29,7 +31,7 @@
       <ResourceCompiler Options=""/>
     </GlobalSettings>
     <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
-      <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" C_Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
+      <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" C_Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" Required="yes" PreCompiledHeader="C:\Users\wittend\Projects\Radio\fdmdv2\pa_enum\main.h" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
         <Preprocessor Value="__WX__"/>
       </Compiler>
@@ -80,7 +82,7 @@
         <Library Value="libportaudiocpp.a"/>
       </Linker>
       <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/>
-      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
+      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
diff --git a/fdmdv2/pa_enum/pa_enum.txt b/fdmdv2/pa_enum/pa_enum.txt
index df3ff299..8e987060 100644
--- a/fdmdv2/pa_enum/pa_enum.txt
+++ b/fdmdv2/pa_enum/pa_enum.txt
@@ -1 +1 @@
-./Debug/gui.o ./Debug/main.o  
+./Release/gui.o ./Release/main.o