SF.net SVN: jazzplusplus: [462] trunk/jazz/src/TrackFrame.cpp

[<pst...@us...>]

Revision: 462
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=462&view=rev
Author:   pstieber
Date:     2008-04-14 10:19:13 -0700 (Mon, 14 Apr 2008)

Log Message:
-----------
Added the Linux version of setting the MIDI device.

Modified Paths:
--------------
    trunk/jazz/src/TrackFrame.cpp

Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp	2008-04-14 17:18:22 UTC (rev 461)
+++ trunk/jazz/src/TrackFrame.cpp	2008-04-14 17:19:13 UTC (rev 462)
@@ -570,8 +570,8 @@
 //-----------------------------------------------------------------------------
 void JZTrackFrame::OnSettingsMidiDevice(wxCommandEvent& Event)
 {
-  long InputDevice, OutputDevice;
 #ifdef __WXMSW__
+  long InputDevice, OutputDevice;
   gpConfig->Get(C_WinInputDevice, InputDevice);
   gpConfig->Get(C_WinOutputDevice, OutputDevice);
   JZWindowsPlayer::SettingsDlg(InputDevice, OutputDevice);
@@ -580,13 +580,12 @@
     "Info",
     wxOK);
 #else
-/*
   if (gpConfig->GetValue(C_MidiDriver) == eMidiDriverOss)
   {
-    int Device = mpMidiPlayer->FindMidiDevice();
+    int Device = gpMidiPlayer->FindMidiDevice();
     if (Device >= 0)
     {
-      SaveMidiDeviceSettings(Device);
+      gpConfig->Put(C_Seq2Device, Device);
       ::wxMessageBox(
         "Restart Jazz++ to activate changes in device settings",
         "Info",
@@ -597,7 +596,6 @@
       ::wxMessageBox("No midi device found", "Info", wxOK);
     }
   }
-*/
 #endif
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.