• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

test


Commit MetaInfo

Revision788e4965b56c4070207c35282c33a55bea217614 (tree)
Time2011-08-21 19:37:39
Authortyiki badwell <miria@user...>
Commitertyiki badwell

Log Message

値型で返すよう修正

Change Summary

Incremental Difference

--- a/Core/Momiji.Core.Midi.In.cpp
+++ b/Core/Momiji.Core.Midi.In.cpp
@@ -206,7 +206,7 @@ namespace In {
206206 return Interop::Winmm::Function::midiInGetNumDevs();
207207 }
208208
209- Interop::Winmm::MidiInCapabilities^ Device::GetCapabilities(
209+ Interop::Winmm::MidiInCapabilities Device::GetCapabilities(
210210 const System::UInt32 deviceID
211211 )
212212 {
@@ -253,7 +253,7 @@ namespace In {
253253 this->Close();
254254 }
255255
256- Interop::Winmm::MidiInCapabilities^ Device::GetCapabilities()
256+ Interop::Winmm::MidiInCapabilities Device::GetCapabilities()
257257 {
258258 return Device::GetCapabilities(this->_deviceID);
259259 }
--- a/Core/Momiji.Core.Midi.In.h
+++ b/Core/Momiji.Core.Midi.In.h
@@ -55,8 +55,8 @@ namespace In {
5555
5656 public:
5757 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();
6060
6161 private:
6262 void Open();
--- a/Core/Momiji.Core.Midi.Out.cpp
+++ b/Core/Momiji.Core.Midi.Out.cpp
@@ -104,7 +104,7 @@ namespace Out {
104104 return Interop::Winmm::Function::midiOutGetNumDevs();
105105 }
106106
107- Interop::Winmm::MidiOutCapabilities^ Device::GetCapabilities(
107+ Interop::Winmm::MidiOutCapabilities Device::GetCapabilities(
108108 const System::UInt32 deviceID
109109 )
110110 {
@@ -152,7 +152,7 @@ namespace Out {
152152 this->Close();
153153 }
154154
155- Interop::Winmm::MidiOutCapabilities^ Device::GetCapabilities()
155+ Interop::Winmm::MidiOutCapabilities Device::GetCapabilities()
156156 {
157157 return Device::GetCapabilities(this->_deviceID);
158158 }
@@ -465,7 +465,7 @@ namespace Out {
465465 System::Console::WriteLine("[{0}]",__FUNCTION__);
466466 #endif
467467
468- Core::Midi::MidiData^ midiData = safe_cast<Core::Midi::MidiData^>(data);
468+ Core::Midi::MidiData^ midiData = dynamic_cast<Core::Midi::MidiData^>(data);
469469 if (midiData == nullptr)
470470 {
471471 return;
@@ -479,14 +479,14 @@ namespace Out {
479479
480480 Device^ d = this->_outs[p];
481481
482- Core::Midi::ShortData^ shortData = safe_cast<Core::Midi::ShortData^>(midiData);
482+ Core::Midi::ShortData^ shortData = dynamic_cast<Core::Midi::ShortData^>(midiData);
483483 if (shortData != nullptr)
484484 {
485485 d->SendShort(shortData->shortData);
486486 return;
487487 }
488488
489- Core::Midi::LongData^ longData = safe_cast<Core::Midi::LongData^>(midiData);
489+ Core::Midi::LongData^ longData = dynamic_cast<Core::Midi::LongData^>(midiData);
490490 if (longData != nullptr)
491491 {
492492 d->SendLong(longData->longData);
--- a/Core/Momiji.Core.Midi.Out.h
+++ b/Core/Momiji.Core.Midi.Out.h
@@ -56,8 +56,8 @@ namespace Out {
5656
5757 public:
5858 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();
6161
6262 private:
6363 void Open();
--- a/Core/Momiji.Core.Wave.Out.cpp
+++ b/Core/Momiji.Core.Wave.Out.cpp
@@ -104,7 +104,7 @@ namespace Out {
104104 }
105105
106106 generic<typename T>
107- Interop::Winmm::WaveOutCapabilities^ Device<T>::GetCapabilities(
107+ Interop::Winmm::WaveOutCapabilities Device<T>::GetCapabilities(
108108 const System::UInt32 deviceID
109109 )
110110 {
@@ -179,7 +179,7 @@ namespace Out {
179179 }
180180
181181 generic<typename T>
182- Interop::Winmm::WaveOutCapabilities^ Device<T>::GetCapabilities()
182+ Interop::Winmm::WaveOutCapabilities Device<T>::GetCapabilities()
183183 {
184184 return Device<T>::GetCapabilities(this->_deviceID);
185185 }
@@ -214,8 +214,8 @@ namespace Out {
214214
215215 this->_headerPool =
216216 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),
219219 gcnew Core::Buffer::HeaderPool<Interop::Winmm::WaveHeader, T>::HeaderInitializer(this, &Device::InitializeHeader)
220220 );
221221
--- a/Core/Momiji.Core.Wave.Out.h
+++ b/Core/Momiji.Core.Wave.Out.h
@@ -73,8 +73,8 @@ namespace Out {
7373
7474 public:
7575 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();
7878
7979 private:
8080 void Open();