test
| Revision | 7e60ed281e2dce7d4eee80de13fcbd794508c246 (tree) |
|---|---|
| Time | 2012-07-01 15:48:21 |
| Author | unknown <yoshihiro@vola...> |
| Commiter | unknown |
参照型に変更
| @@ -90,7 +90,7 @@ namespace Timer { | ||
| 90 | 90 | |
| 91 | 91 | Interop::Winmm::TimeCapabilities^ MMTimer::getCapabilities() |
| 92 | 92 | { |
| 93 | - auto caps = Interop::Winmm::TimeCapabilities(); | |
| 93 | + auto caps = gcnew Interop::Winmm::TimeCapabilities(); | |
| 94 | 94 | #ifdef _DEBUG |
| 95 | 95 | System::Console::WriteLine("[{0}] caps size {1}",__FUNCTION__, InteropServices::Marshal::SizeOf(caps)); |
| 96 | 96 | #endif |
| @@ -105,7 +105,7 @@ namespace Timer { | ||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | #ifdef _DEBUG |
| 108 | - System::Console::WriteLine("[{0}] min {1}, max {2}",__FUNCTION__, caps.periodMin, caps.periodMax); | |
| 108 | + System::Console::WriteLine("[{0}] min {1}, max {2}",__FUNCTION__, caps->periodMin, caps->periodMax); | |
| 109 | 109 | #endif |
| 110 | 110 | |
| 111 | 111 | return caps; |
| @@ -317,7 +317,7 @@ namespace Out { | ||
| 317 | 317 | |
| 318 | 318 | waveHeader->bytesRecorded = 0; |
| 319 | 319 | waveHeader->user = System::IntPtr::Zero; |
| 320 | - waveHeader->next = 0; | |
| 320 | + waveHeader->next = System::IntPtr::Zero; | |
| 321 | 321 | waveHeader->reserved = System::IntPtr::Zero; |
| 322 | 322 | |
| 323 | 323 | #ifdef _DEBUG |
| @@ -481,12 +481,12 @@ namespace Ks { | ||
| 481 | 481 | WIN32_DLL_STRUCTLAYOUT public value struct KsDataFormatWaveFormatEx |
| 482 | 482 | { |
| 483 | 483 | KsDataFormat DataFormat; |
| 484 | - Interop::Winmm::WaveFormatEx wfe; | |
| 484 | + Interop::Winmm::WaveFormatEx^ wfe; | |
| 485 | 485 | |
| 486 | 486 | virtual System::String^ ToString() override |
| 487 | 487 | { |
| 488 | 488 | return |
| 489 | - "dataFormat["+DataFormat.ToString()+"] wfe["+wfe.ToString()+"]"; | |
| 489 | + "dataFormat["+DataFormat.ToString()+"] wfe["+wfe->ToString()+"]"; | |
| 490 | 490 | } |
| 491 | 491 | }; |
| 492 | 492 |
| @@ -496,7 +496,7 @@ namespace Ks { | ||
| 496 | 496 | { |
| 497 | 497 | System::UInt32 Flags; |
| 498 | 498 | System::UInt32 Control; |
| 499 | - Interop::Winmm::WaveFormatEx wfe; | |
| 499 | + Interop::Winmm::WaveFormatEx^ wfe; | |
| 500 | 500 | }; |
| 501 | 501 | |
| 502 | 502 | // DirectSound format |
| @@ -246,7 +246,7 @@ namespace Winmm { | ||
| 246 | 246 | ); |
| 247 | 247 | }; |
| 248 | 248 | |
| 249 | - WIN32_DLL_STRUCTLAYOUT public value struct TimeCapabilities { | |
| 249 | + WIN32_DLL_STRUCTLAYOUT public ref struct TimeCapabilities { | |
| 250 | 250 | System::UInt32 periodMin; // minimum period supported |
| 251 | 251 | System::UInt32 periodMax; // maximum period supported |
| 252 | 252 | }; |
| @@ -281,7 +281,7 @@ namespace Winmm { | ||
| 281 | 281 | System::IntPtr user; // for client's use |
| 282 | 282 | FLAG flags; // assorted flags (see defines) |
| 283 | 283 | System::UInt32 loops; // loop control counter |
| 284 | - System::UInt32 next; // reserved for driver | |
| 284 | + System::IntPtr next; // reserved for driver | |
| 285 | 285 | System::IntPtr reserved; // reserved for driver |
| 286 | 286 | |
| 287 | 287 | virtual System::String^ ToString() override |
| @@ -702,7 +702,7 @@ namespace Winmm { | ||
| 702 | 702 | ); |
| 703 | 703 | |
| 704 | 704 | WIN_MM_DLLIMPORT static MMRESULT timeGetDevCaps( |
| 705 | - [InteropServices::Out] TimeCapabilities% ptc, | |
| 705 | + [InteropServices::Out] TimeCapabilities^ ptc, | |
| 706 | 706 | [InteropServices::In] System::UInt32 cbtc |
| 707 | 707 | ); |
| 708 | 708 | /* |
| @@ -103,7 +103,7 @@ namespace Wave { | ||
| 103 | 103 | |
| 104 | 104 | System::UInt32 WaveStream::Read(array<System::Byte>^ buffer, System::UInt32 samplesPerBuffer); |
| 105 | 105 | |
| 106 | - property Momiji::Interop::Winmm::WaveFormatEx format { Momiji::Interop::Winmm::WaveFormatEx get() {return this->_wfx;} } | |
| 106 | + property Momiji::Interop::Winmm::WaveFormatEx^ format { Momiji::Interop::Winmm::WaveFormatEx^ get() {return this->_wfx;} } | |
| 107 | 107 | |
| 108 | 108 | }; |
| 109 | 109 |
| @@ -180,19 +180,19 @@ namespace MomijiTestSequencerWave { | ||
| 180 | 180 | |
| 181 | 181 | this->_bufferPool = |
| 182 | 182 | gcnew Momiji::Core::Buffer::BufferPool<array<System::Byte>^>( |
| 183 | - ((wfx.samplesPerSecond / (samplesPerBuffer * wfx.blockAlign)) + 2), //1秒分+2回 | |
| 183 | + ((wfx->samplesPerSecond / (samplesPerBuffer * wfx->blockAlign)) + 2), //1秒分+2回 | |
| 184 | 184 | gcnew Momiji::Core::Buffer::BufferPool<array<System::Byte>^>::Allocator(this, &TestWave::AllocateBuffer) |
| 185 | 185 | ); |
| 186 | 186 | |
| 187 | - auto count = (wfx.samplesPerSecond / this->_samplesPerBuffer) + 2; | |
| 187 | + auto count = (wfx->samplesPerSecond / this->_samplesPerBuffer) + 2; | |
| 188 | 188 | |
| 189 | 189 | Console::WriteLine("samplesPerBuffer {0} count {1}", this->_samplesPerBuffer, count); |
| 190 | 190 | |
| 191 | 191 | o = gcnew Momiji::Core::Wave::Out::Device( |
| 192 | 192 | 0, |
| 193 | - wfx.channels, | |
| 194 | - wfx.samplesPerSecond, | |
| 195 | - wfx.bitsPerSample, | |
| 193 | + wfx->channels, | |
| 194 | + wfx->samplesPerSecond, | |
| 195 | + wfx->bitsPerSample, | |
| 196 | 196 | ( |
| 197 | 197 | Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_LEFT |
| 198 | 198 | | Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_RIGHT |
| @@ -260,26 +260,25 @@ void test0() | ||
| 260 | 260 | |
| 261 | 261 | Momiji::Core::ITimer^ t; |
| 262 | 262 | Momiji::Core::IStream^ s; |
| 263 | - Momiji::Core::Wave::Out::Devices<System::Single>^ o; | |
| 263 | + Momiji::Core::Wave::Out::Device^ o; | |
| 264 | 264 | Momiji::Core::Vst::Host::Master^ h; |
| 265 | 265 | Controller^ c; |
| 266 | 266 | try |
| 267 | 267 | { |
| 268 | 268 | t = gcnew Momiji::Core::Timer::MMTimer(); |
| 269 | 269 | s = gcnew Momiji::Sequencer::Midi::Smf::SmfStream(smfFileName); |
| 270 | - o = gcnew Momiji::Core::Wave::Out::Devices<System::Single>(); | |
| 271 | - o->AddPort( | |
| 272 | - 0, | |
| 273 | - 2, | |
| 274 | - 48000, | |
| 275 | - System::Runtime::InteropServices::Marshal::SizeOf(System::Single::typeid) * 8, | |
| 276 | - ( | |
| 277 | - Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_LEFT | |
| 278 | - | Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_RIGHT | |
| 279 | - ), | |
| 280 | - Momiji::Interop::Ks::StaticKs::SUBTYPE_IEEE_FLOAT, | |
| 281 | - 48000 | |
| 282 | - ); | |
| 270 | + o = gcnew Momiji::Core::Wave::Out::Device( | |
| 271 | + 0, | |
| 272 | + 2, | |
| 273 | + 48000, | |
| 274 | + System::Runtime::InteropServices::Marshal::SizeOf(System::Single::typeid) * 8, | |
| 275 | + ( | |
| 276 | + Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_LEFT | |
| 277 | + | Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_RIGHT | |
| 278 | + ), | |
| 279 | + Momiji::Interop::Ks::StaticKs::SUBTYPE_IEEE_FLOAT, | |
| 280 | + 48000 | |
| 281 | + ); | |
| 283 | 282 | |
| 284 | 283 | c = gcnew Controller(); |
| 285 | 284 | c->Assign(t); |
| @@ -71,7 +71,8 @@ void test0() | ||
| 71 | 71 | Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_LEFT |
| 72 | 72 | | Momiji::Interop::Winmm::WaveFormatExtensiblePart::SPEAKER::FRONT_RIGHT |
| 73 | 73 | ), |
| 74 | - Momiji::Interop::Ks::StaticKs::SUBTYPE_IEEE_FLOAT | |
| 74 | + Momiji::Interop::Ks::StaticKs::SUBTYPE_IEEE_FLOAT, | |
| 75 | + 44110 | |
| 75 | 76 | ); |
| 76 | 77 | |
| 77 | 78 | try |
| @@ -92,7 +93,7 @@ void test0() | ||
| 92 | 93 | auto e = Momiji::Interop::Vst::VstEvent(); |
| 93 | 94 | e.type = Momiji::Interop::Vst::VstEvent::VstEventTypes::kVstMidiType; |
| 94 | 95 | e.flags = Momiji::Interop::Vst::VstEvent::VstMidiEventFlags::kVstMidiEventIsRealtime; |
| 95 | - e.deltaFrames = 200; | |
| 96 | + e.deltaFrames = 20000; | |
| 96 | 97 | e.midiData0 = 0x91; |
| 97 | 98 | e.midiData1 = 0x55; |
| 98 | 99 | e.midiData2 = 0x7F; |
| @@ -102,7 +103,7 @@ void test0() | ||
| 102 | 103 | auto e = Momiji::Interop::Vst::VstEvent(); |
| 103 | 104 | e.type = Momiji::Interop::Vst::VstEvent::VstEventTypes::kVstMidiType; |
| 104 | 105 | e.flags = Momiji::Interop::Vst::VstEvent::VstMidiEventFlags::kVstMidiEventIsRealtime; |
| 105 | - e.deltaFrames = 200; | |
| 106 | + e.deltaFrames = 40000; | |
| 106 | 107 | e.midiData0 = 0x93; |
| 107 | 108 | e.midiData1 = 0x68; |
| 108 | 109 | e.midiData2 = 0x7F; |
| @@ -118,8 +119,8 @@ void test0() | ||
| 118 | 119 | |
| 119 | 120 | Console::WriteLine("====================================================test0"); |
| 120 | 121 | { |
| 121 | - auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 122 | - auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 122 | + auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 123 | + auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 123 | 124 | host->Process(inBuffer, outBuffer, outBuffer->Length()); |
| 124 | 125 | out->Send(outBuffer->GetBuffer()[0]); |
| 125 | 126 | } |
| @@ -127,8 +128,8 @@ void test0() | ||
| 127 | 128 | |
| 128 | 129 | Console::WriteLine("====================================================test0"); |
| 129 | 130 | { |
| 130 | - auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 131 | - auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 131 | + auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 132 | + auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 132 | 133 | host->Process(inBuffer, outBuffer, outBuffer->Length()); |
| 133 | 134 | out->Send(outBuffer->GetBuffer()[0]); |
| 134 | 135 | } |
| @@ -136,8 +137,8 @@ void test0() | ||
| 136 | 137 | |
| 137 | 138 | Console::WriteLine("====================================================test0"); |
| 138 | 139 | { |
| 139 | - auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 140 | - auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 140 | + auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 141 | + auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 141 | 142 | host->Process(inBuffer, outBuffer, outBuffer->Length()); |
| 142 | 143 | out->Send(outBuffer->GetBuffer()[0]); |
| 143 | 144 | } |
| @@ -145,8 +146,8 @@ void test0() | ||
| 145 | 146 | |
| 146 | 147 | Console::WriteLine("====================================================test0"); |
| 147 | 148 | { |
| 148 | - auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 149 | - auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,40000); | |
| 149 | + auto inBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 150 | + auto outBuffer = gcnew Momiji::Core::Vst::Buffer::VstBuffer<System::Single>(2,44110); | |
| 150 | 151 | host->Process(inBuffer, outBuffer, outBuffer->Length()); |
| 151 | 152 | out->Send(outBuffer->GetBuffer()[0]); |
| 152 | 153 | } |