jazzplusplus-updates

SF.net SVN: jazzplusplus:[663] trunk/jazz/src/mswin/WindowsPlayer.cpp

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

Revision: 663
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=663&view=rev
Author:   pstieber
Date:     2008-12-30 22:55:10 +0000 (Tue, 30 Dec 2008)

Log Message:
-----------
Made a cosmetic change in a comment.

Modified Paths:
--------------
    trunk/jazz/src/mswin/WindowsPlayer.cpp

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2008-12-30 22:54:27 UTC (rev 662)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2008-12-30 22:55:10 UTC (rev 663)
@@ -1001,7 +1001,11 @@
 {
   vector<pair<string, int> > MidiDevices;
 
-  // select input device
+  //=========================
+  // Select the input device.
+  //=========================
+
+  // Get a list of the available input devices.
   UINT i;
   UINT InputMidiDeviceCount = midiInGetNumDevs();
   for (i = 0; i < InputMidiDeviceCount; ++i)


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

SF.net SVN: jazzplusplus:[799] trunk/jazz/src/mswin/WindowsPlayer.cpp

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

Revision: 799
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=799&view=rev
Author:   pstieber
Date:     2010-07-17 16:13:22 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
1. Used MAXERRORLENGTH for error message size instead of a hard-coded 200.
2. Wrapped a line longer than 80 columns.
3. Changed some message box formatting.

Modified Paths:
--------------
    trunk/jazz/src/mswin/WindowsPlayer.cpp

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2010-07-17 15:29:31 UTC (rev 798)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2010-07-17 16:13:22 UTC (rev 799)
@@ -114,9 +114,9 @@
     }
     if (rc)
     {
-      char errtxt[200];
-      midiInGetErrorText(rc, (LPSTR)errtxt, sizeof(errtxt));
-      wxMessageBox(errtxt, "open midi input", wxOK);
+      char ErrorMessage[MAXERRORLENGTH];
+      midiInGetErrorText(rc, (LPSTR)ErrorMessage, sizeof(ErrorMessage));
+      ::wxMessageBox(ErrorMessage, "Open MIDI Input", wxOK);
     }
   }
 
@@ -128,12 +128,17 @@
       dev = MIDI_MAPPER;
 
     //UINT rc = midiOutOpen(&mpState->hout, dev, 0L, 0L, 0L);
-    UINT rc = midiOutOpen(&mpState->hout, dev, (DWORD)MidiOutProc, (DWORD)mpState, CALLBACK_FUNCTION);
+    UINT rc = midiOutOpen(
+      &mpState->hout,
+      dev,
+      (DWORD)MidiOutProc,
+      (DWORD)mpState,
+      CALLBACK_FUNCTION);
     if (rc)
     {
-      char errtxt[200];
-      midiOutGetErrorText(rc, (LPSTR)errtxt, sizeof(errtxt));
-      wxMessageBox(errtxt, "open midi output", wxOK);
+      char ErrorMessage[MAXERRORLENGTH];
+      midiOutGetErrorText(rc, (LPSTR)ErrorMessage, sizeof(ErrorMessage));
+      ::wxMessageBox(ErrorMessage, "Open MIDI Output", wxOK);
     }
   }
 
@@ -148,7 +153,9 @@
         timer_installed = TRUE;
     }
     if (!timer_installed)
-      wxMessageBox("could not install timer", "midi timer", wxOK);
+    {
+      ::wxMessageBox("Could not install timer", "MIDI timer", wxOK);
+    }
   }
 
 


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

SF.net SVN: jazzplusplus:[891] trunk/jazz/src/mswin/WindowsPlayer.cpp

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

Revision: 891
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=891&view=rev
Author:   pstieber
Date:     2011-08-05 20:49:14 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Changed std::string to wxString.

Modified Paths:
--------------
    trunk/jazz/src/mswin/WindowsPlayer.cpp

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2011-08-05 20:44:39 UTC (rev 890)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2011-08-05 20:49:14 UTC (rev 891)
@@ -1023,7 +1023,7 @@
 //-----------------------------------------------------------------------------
 void JZWindowsPlayer::SettingsDlg(int& InputDevice, int& OutputDevice)
 {
-  vector<pair<string, int> > MidiDevices;
+  vector<pair<wxString, int> > MidiDevices;
 
   //=========================
   // Select the input device.


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

SF.net SVN: jazzplusplus:[905] trunk/jazz/src/mswin/WindowsPlayer.cpp

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

Revision: 905
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=905&view=rev
Author:   pstieber
Date:     2011-08-08 00:53:58 +0000 (Mon, 08 Aug 2011)

Log Message:
-----------
1. Changed dev to DeviceId.
2. Fixed incorrect pointer casts from DWORD to DWORD_PTR in calls to midiInOpen and midiOutOpen.
This fixed a crash in the Windows 64-bit build.

Modified Paths:
--------------
    trunk/jazz/src/mswin/WindowsPlayer.cpp

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2011-08-08 00:13:55 UTC (rev 904)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2011-08-08 00:53:58 UTC (rev 905)
@@ -81,24 +81,24 @@
   // select input device
   if (ilong >= 0)
   {
-    UINT dev = (UINT)ilong;
+    UINT DeviceId = (UINT)ilong;
     UINT rc;
     switch (gpConfig->GetValue(C_ClockSource))
     {
       case CsMidi:
         rc = midiInOpen(
           &mpState->hinp,
-          dev,
-          (DWORD)midiMidiInputHandler,
-          (DWORD)mpState,
+          DeviceId,
+          (DWORD_PTR)midiMidiInputHandler,
+          (DWORD_PTR)mpState,
           CALLBACK_FUNCTION);
         break;
       case CsMtc:
         rc = midiInOpen(
           &mpState->hinp,
-          dev,
-          (DWORD)midiMtcInputHandler,
-          (DWORD)mpState,
+          DeviceId,
+          (DWORD_PTR)midiMtcInputHandler,
+          (DWORD_PTR)mpState,
           CALLBACK_FUNCTION);
         break;
       case CsInt:
@@ -106,9 +106,9 @@
       default:
         rc = midiInOpen(
           &mpState->hinp,
-          dev,
-          (DWORD)midiIntInputHandler,
-          (DWORD)mpState,
+          DeviceId,
+          (DWORD_PTR)midiIntInputHandler,
+          (DWORD_PTR)mpState,
           CALLBACK_FUNCTION);
         break;
     }
@@ -123,16 +123,18 @@
   // select output device
   if (olong >= 0)
   {
-    UINT dev = (UINT)olong;
-    if (dev == MAX_MIDI_DEVS)
-      dev = MIDI_MAPPER;
+    UINT DeviceId = (UINT)olong;
+    if (DeviceId == MAX_MIDI_DEVS)
+    {
+      DeviceId = MIDI_MAPPER;
+    }
 
-    //UINT rc = midiOutOpen(&mpState->hout, dev, 0L, 0L, 0L);
+    //UINT rc = midiOutOpen(&mpState->hout, DeviceId, 0L, 0L, 0L);
     UINT rc = midiOutOpen(
       &mpState->hout,
-      dev,
-      (DWORD)MidiOutProc,
-      (DWORD)mpState,
+      DeviceId,
+      (DWORD_PTR)MidiOutProc,
+      (DWORD_PTR)mpState,
       CALLBACK_FUNCTION);
     if (rc)
     {


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