From: <pst...@us...> - 2008-12-15 05:36:56
|
Revision: 643 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=643&view=rev Author: pstieber Date: 2008-12-15 05:36:52 +0000 (Mon, 15 Dec 2008) Log Message: ----------- Removed white space from the end of a line. Modified Paths: -------------- trunk/jazz/src/PortMidiPlayer.cpp Modified: trunk/jazz/src/PortMidiPlayer.cpp =================================================================== --- trunk/jazz/src/PortMidiPlayer.cpp 2008-12-08 06:07:12 UTC (rev 642) +++ trunk/jazz/src/PortMidiPlayer.cpp 2008-12-15 05:36:52 UTC (rev 643) @@ -125,7 +125,7 @@ if (pPmDeviceInfo && pPmDeviceInfo->output) { - wxString Name = + wxString Name = wxString(pPmDeviceInfo->interf, wxConvISO8859_1) + wxT(", ") + wxString(pPmDeviceInfo->name, wxConvISO8859_1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2011-08-05 20:42:42
|
Revision: 889 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=889&view=rev Author: pstieber Date: 2011-08-05 20:42:36 +0000 (Fri, 05 Aug 2011) Log Message: ----------- Converted std::string to wxString. Modified Paths: -------------- trunk/jazz/src/PortMidiPlayer.cpp Modified: trunk/jazz/src/PortMidiPlayer.cpp =================================================================== --- trunk/jazz/src/PortMidiPlayer.cpp 2011-08-05 20:39:53 UTC (rev 888) +++ trunk/jazz/src/PortMidiPlayer.cpp 2011-08-05 20:42:36 UTC (rev 889) @@ -451,7 +451,7 @@ bool NeedToTerminate = InitPM(); int Count = Pm_CountDevices(); - vector<pair<string, int> > MidiDevices; + vector<pair<wxString, int> > MidiDevices; // Create a container of input devices. for (int i = 0; i < Count; ++i) @@ -465,7 +465,7 @@ wxT(", ") + wxString(pPmDeviceInfo->name, wxConvISO8859_1); - MidiDevices.push_back(make_pair(Name.c_str(), i)); + MidiDevices.push_back(make_pair(Name, i)); } } @@ -482,14 +482,14 @@ // Set the input device based on the selected integer. for ( - vector<pair<string, int> >::const_iterator iDevice = + vector<pair<wxString, int> >::const_iterator iDevice = MidiDevices.begin(); iDevice != MidiDevices.end(); ++iDevice) { if (iDevice->second == InputDevice) { - SetOutputDevice(iDevice->first.c_str()); + SetOutputDevice(iDevice->first); break; } } @@ -509,7 +509,7 @@ wxT(", ") + wxString(pPmDeviceInfo->name, wxConvISO8859_1); - MidiDevices.push_back(make_pair(Name.c_str(), i)); + MidiDevices.push_back(make_pair(Name, i)); } } @@ -526,14 +526,14 @@ // Set the output device based on the selected integer. for ( - vector<pair<string, int> >::const_iterator iDevice = + vector<pair<wxString, int> >::const_iterator iDevice = MidiDevices.begin(); iDevice != MidiDevices.end(); ++iDevice) { if (iDevice->second == OutputDevice) { - SetOutputDevice(iDevice->first.c_str()); + SetOutputDevice(iDevice->first); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |