SF.net SVN: jazzplusplus:[893] trunk/jazz/src/mswin

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

Revision: 893
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=893&view=rev
Author:   pstieber
Date:     2011-08-06 15:04:06 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
Updated to deal with Unicode.

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

Modified: trunk/jazz/src/mswin/WindowsMidiInterface.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.cpp	2011-08-05 23:15:13 UTC (rev 892)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.cpp	2011-08-06 15:04:06 UTC (rev 893)
@@ -624,11 +624,10 @@
     if (buf != 0)
     {  // ignore OutNow() buffers
       buf->Release();
-      OutputDebugString("release\n");
+      OutputDebugString(L"release\n");
     }
   }
 }
 
 
 } // extern "C"
-

Modified: trunk/jazz/src/mswin/WindowsMidiInterface.h
===================================================================
--- trunk/jazz/src/mswin/WindowsMidiInterface.h	2011-08-05 23:15:13 UTC (rev 892)
+++ trunk/jazz/src/mswin/WindowsMidiInterface.h	2011-08-06 15:04:06 UTC (rev 893)
@@ -107,7 +107,7 @@
       hdr.dwUser = (DWORD)this;
       hdr.lpData = (char *)data;
       hdr.dwBufferLength = size;
-      OutputDebugString("prepare\n");
+      OutputDebugString(L"prepare\n");
       midiOutPrepareHeader(hmo, &hdr, sizeof(hdr));
       prepared = 1;
     }
@@ -116,7 +116,7 @@
     {
       if (prepared)
       {
-        OutputDebugString("unprepare\n");
+        OutputDebugString(L"unprepare\n");
         midiOutUnprepareHeader(hmo, &hdr, sizeof(hdr));
         size = 0;
         prepared = 0;

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2011-08-05 23:15:13 UTC (rev 892)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2011-08-06 15:04:06 UTC (rev 893)
@@ -114,8 +114,8 @@
     }
     if (rc)
     {
-      char ErrorMessage[MAXERRORLENGTH];
-      midiInGetErrorText(rc, (LPSTR)ErrorMessage, sizeof(ErrorMessage));
+      wchar_t ErrorMessage[MAXERRORLENGTH];
+      midiInGetErrorText(rc, ErrorMessage, sizeof(ErrorMessage));
       ::wxMessageBox(ErrorMessage, "Open MIDI Input", wxOK);
     }
   }
@@ -136,8 +136,8 @@
       CALLBACK_FUNCTION);
     if (rc)
     {
-      char ErrorMessage[MAXERRORLENGTH];
-      midiOutGetErrorText(rc, (LPSTR)ErrorMessage, sizeof(ErrorMessage));
+      wchar_t ErrorMessage[MAXERRORLENGTH];
+      midiOutGetErrorText(rc, ErrorMessage, sizeof(ErrorMessage));
       ::wxMessageBox(ErrorMessage, "Open MIDI Output", wxOK);
     }
   }


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