test
| Revision | 788e4965b56c4070207c35282c33a55bea217614 (tree) |
|---|---|
| Time | 2011-08-21 19:37:39 |
| Author | tyiki badwell <miria@user...> |
| Commiter | tyiki badwell |
値型で返すよう修正
| @@ -206,7 +206,7 @@ namespace In { | ||
| 206 | 206 | return Interop::Winmm::Function::midiInGetNumDevs(); |
| 207 | 207 | } |
| 208 | 208 | |
| 209 | - Interop::Winmm::MidiInCapabilities^ Device::GetCapabilities( | |
| 209 | + Interop::Winmm::MidiInCapabilities Device::GetCapabilities( | |
| 210 | 210 | const System::UInt32 deviceID |
| 211 | 211 | ) |
| 212 | 212 | { |
| @@ -253,7 +253,7 @@ namespace In { | ||
| 253 | 253 | this->Close(); |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | - Interop::Winmm::MidiInCapabilities^ Device::GetCapabilities() | |
| 256 | + Interop::Winmm::MidiInCapabilities Device::GetCapabilities() | |
| 257 | 257 | { |
| 258 | 258 | return Device::GetCapabilities(this->_deviceID); |
| 259 | 259 | } |
| @@ -55,8 +55,8 @@ namespace In { | ||
| 55 | 55 | |
| 56 | 56 | public: |
| 57 | 57 | static System::UInt32 GetNumDevices(); |
| 58 | - static Interop::Winmm::MidiInCapabilities^ GetCapabilities(const System::UInt32 uDeviceID); | |
| 59 | - Interop::Winmm::MidiInCapabilities^ GetCapabilities(); | |
| 58 | + static Interop::Winmm::MidiInCapabilities GetCapabilities(const System::UInt32 uDeviceID); | |
| 59 | + Interop::Winmm::MidiInCapabilities GetCapabilities(); | |
| 60 | 60 | |
| 61 | 61 | private: |
| 62 | 62 | void Open(); |
| @@ -104,7 +104,7 @@ namespace Out { | ||
| 104 | 104 | return Interop::Winmm::Function::midiOutGetNumDevs(); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - Interop::Winmm::MidiOutCapabilities^ Device::GetCapabilities( | |
| 107 | + Interop::Winmm::MidiOutCapabilities Device::GetCapabilities( | |
| 108 | 108 | const System::UInt32 deviceID |
| 109 | 109 | ) |
| 110 | 110 | { |
| @@ -152,7 +152,7 @@ namespace Out { | ||
| 152 | 152 | this->Close(); |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - Interop::Winmm::MidiOutCapabilities^ Device::GetCapabilities() | |
| 155 | + Interop::Winmm::MidiOutCapabilities Device::GetCapabilities() | |
| 156 | 156 | { |
| 157 | 157 | return Device::GetCapabilities(this->_deviceID); |
| 158 | 158 | } |
| @@ -465,7 +465,7 @@ namespace Out { | ||
| 465 | 465 | System::Console::WriteLine("[{0}]",__FUNCTION__); |
| 466 | 466 | #endif |
| 467 | 467 | |
| 468 | - Core::Midi::MidiData^ midiData = safe_cast<Core::Midi::MidiData^>(data); | |
| 468 | + Core::Midi::MidiData^ midiData = dynamic_cast<Core::Midi::MidiData^>(data); | |
| 469 | 469 | if (midiData == nullptr) |
| 470 | 470 | { |
| 471 | 471 | return; |
| @@ -479,14 +479,14 @@ namespace Out { | ||
| 479 | 479 | |
| 480 | 480 | Device^ d = this->_outs[p]; |
| 481 | 481 | |
| 482 | - Core::Midi::ShortData^ shortData = safe_cast<Core::Midi::ShortData^>(midiData); | |
| 482 | + Core::Midi::ShortData^ shortData = dynamic_cast<Core::Midi::ShortData^>(midiData); | |
| 483 | 483 | if (shortData != nullptr) |
| 484 | 484 | { |
| 485 | 485 | d->SendShort(shortData->shortData); |
| 486 | 486 | return; |
| 487 | 487 | } |
| 488 | 488 | |
| 489 | - Core::Midi::LongData^ longData = safe_cast<Core::Midi::LongData^>(midiData); | |
| 489 | + Core::Midi::LongData^ longData = dynamic_cast<Core::Midi::LongData^>(midiData); | |
| 490 | 490 | if (longData != nullptr) |
| 491 | 491 | { |
| 492 | 492 | d->SendLong(longData->longData); |
| @@ -56,8 +56,8 @@ namespace Out { | ||
| 56 | 56 | |
| 57 | 57 | public: |
| 58 | 58 | static System::UInt32 GetNumDevices(); |
| 59 | - static Interop::Winmm::MidiOutCapabilities^ GetCapabilities(System::UInt32 uDeviceID); | |
| 60 | - Interop::Winmm::MidiOutCapabilities^ GetCapabilities(); | |
| 59 | + static Interop::Winmm::MidiOutCapabilities GetCapabilities(System::UInt32 uDeviceID); | |
| 60 | + Interop::Winmm::MidiOutCapabilities GetCapabilities(); | |
| 61 | 61 | |
| 62 | 62 | private: |
| 63 | 63 | void Open(); |
| @@ -104,7 +104,7 @@ namespace Out { | ||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | generic<typename T> |
| 107 | - Interop::Winmm::WaveOutCapabilities^ Device<T>::GetCapabilities( | |
| 107 | + Interop::Winmm::WaveOutCapabilities Device<T>::GetCapabilities( | |
| 108 | 108 | const System::UInt32 deviceID |
| 109 | 109 | ) |
| 110 | 110 | { |
| @@ -179,7 +179,7 @@ namespace Out { | ||
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | generic<typename T> |
| 182 | - Interop::Winmm::WaveOutCapabilities^ Device<T>::GetCapabilities() | |
| 182 | + Interop::Winmm::WaveOutCapabilities Device<T>::GetCapabilities() | |
| 183 | 183 | { |
| 184 | 184 | return Device<T>::GetCapabilities(this->_deviceID); |
| 185 | 185 | } |
| @@ -214,8 +214,8 @@ namespace Out { | ||
| 214 | 214 | |
| 215 | 215 | this->_headerPool = |
| 216 | 216 | gcnew Core::Buffer::HeaderPool<Interop::Winmm::WaveHeader, T>( |
| 217 | - 2, //2回分のバッファを用意 | |
| 218 | - (this->_samplesPerBuffer * this->_channels * this->_bitsPerSample / 8), | |
| 217 | + ((this->_samplesPerSecond / (this->_samplesPerBuffer * format.wfe.blockAlign)) + 2), //1秒分+2回 | |
| 218 | + (this->_samplesPerBuffer * format.wfe.blockAlign), | |
| 219 | 219 | gcnew Core::Buffer::HeaderPool<Interop::Winmm::WaveHeader, T>::HeaderInitializer(this, &Device::InitializeHeader) |
| 220 | 220 | ); |
| 221 | 221 |
| @@ -73,8 +73,8 @@ namespace Out { | ||
| 73 | 73 | |
| 74 | 74 | public: |
| 75 | 75 | static System::UInt32 GetNumDevices(); |
| 76 | - static Interop::Winmm::WaveOutCapabilities^ GetCapabilities(System::UInt32 uDeviceID); | |
| 77 | - Interop::Winmm::WaveOutCapabilities^ GetCapabilities(); | |
| 76 | + static Interop::Winmm::WaveOutCapabilities GetCapabilities(System::UInt32 uDeviceID); | |
| 77 | + Interop::Winmm::WaveOutCapabilities GetCapabilities(); | |
| 78 | 78 | |
| 79 | 79 | private: |
| 80 | 80 | void Open(); |