Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
05fc12dd
Commit
05fc12dd
authored
Aug 03, 2018
by
Marcelo Fernandez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add OS::open_midi_inputs and OS::close_midi_inputs
parent
6c569c90
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
55 additions
and
10 deletions
+55
-10
core_bind.cpp
core/bind/core_bind.cpp
+10
-0
core_bind.h
core/bind/core_bind.h
+2
-0
os.cpp
core/os/os.cpp
+12
-0
os.h
core/os/os.h
+2
-0
core_midi.cpp
drivers/coremidi/core_midi.cpp
+19
-0
core_midi.h
drivers/coremidi/core_midi.h
+2
-0
win_midi.cpp
drivers/winmidi/win_midi.cpp
+6
-0
os_osx.mm
platform/osx/os_osx.mm
+2
-2
os_windows.cpp
platform/windows/os_windows.cpp
+0
-4
os_x11.cpp
platform/x11/os_x11.cpp
+0
-4
No files found.
core/bind/core_bind.cpp
View file @
05fc12dd
...
...
@@ -225,6 +225,14 @@ PoolStringArray _OS::get_connected_midi_inputs() {
return
OS
::
get_singleton
()
->
get_connected_midi_inputs
();
}
void
_OS
::
open_midi_inputs
()
{
return
OS
::
get_singleton
()
->
open_midi_inputs
();
}
void
_OS
::
close_midi_inputs
()
{
return
OS
::
get_singleton
()
->
close_midi_inputs
();
}
void
_OS
::
set_video_mode
(
const
Size2
&
p_size
,
bool
p_fullscreen
,
bool
p_resizeable
,
int
p_screen
)
{
OS
::
VideoMode
vm
;
...
...
@@ -1063,6 +1071,8 @@ void _OS::_bind_methods() {
ClassDB
::
bind_method
(
D_METHOD
(
"get_audio_driver_count"
),
&
_OS
::
get_audio_driver_count
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_audio_driver_name"
,
"driver"
),
&
_OS
::
get_audio_driver_name
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_connected_midi_inputs"
),
&
_OS
::
get_connected_midi_inputs
);
ClassDB
::
bind_method
(
D_METHOD
(
"open_midi_inputs"
),
&
_OS
::
open_midi_inputs
);
ClassDB
::
bind_method
(
D_METHOD
(
"close_midi_inputs"
),
&
_OS
::
close_midi_inputs
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_screen_count"
),
&
_OS
::
get_screen_count
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_current_screen"
),
&
_OS
::
get_current_screen
);
...
...
core/bind/core_bind.h
View file @
05fc12dd
...
...
@@ -153,6 +153,8 @@ public:
virtual
String
get_audio_driver_name
(
int
p_driver
)
const
;
virtual
PoolStringArray
get_connected_midi_inputs
();
virtual
void
open_midi_inputs
();
virtual
void
close_midi_inputs
();
virtual
int
get_screen_count
()
const
;
virtual
int
get_current_screen
()
const
;
...
...
core/os/os.cpp
View file @
05fc12dd
...
...
@@ -689,6 +689,18 @@ PoolStringArray OS::get_connected_midi_inputs() {
return
list
;
}
void
OS
::
open_midi_inputs
()
{
if
(
MIDIDriver
::
get_singleton
())
MIDIDriver
::
get_singleton
()
->
open
();
}
void
OS
::
close_midi_inputs
()
{
if
(
MIDIDriver
::
get_singleton
())
MIDIDriver
::
get_singleton
()
->
close
();
}
OS
::
OS
()
{
void
*
volatile
stack_bottom
;
...
...
core/os/os.h
View file @
05fc12dd
...
...
@@ -190,6 +190,8 @@ public:
virtual
const
char
*
get_audio_driver_name
(
int
p_driver
)
const
;
virtual
PoolStringArray
get_connected_midi_inputs
();
virtual
void
open_midi_inputs
();
virtual
void
close_midi_inputs
();
virtual
int
get_screen_count
()
const
{
return
1
;
}
virtual
int
get_current_screen
()
const
{
return
0
;
}
...
...
drivers/coremidi/core_midi.cpp
View file @
05fc12dd
...
...
@@ -92,6 +92,25 @@ void MIDIDriverCoreMidi::close() {
}
}
PoolStringArray
MIDIDriverCoreMidi
::
get_connected_inputs
()
{
PoolStringArray
list
;
for
(
int
i
=
0
;
i
<
connected_sources
.
size
();
i
++
)
{
MIDIEndpointRef
source
=
connected_sources
[
i
];
CFStringRef
ref
=
NULL
;
char
name
[
256
];
MIDIObjectGetStringProperty
(
source
,
kMIDIPropertyDisplayName
,
&
ref
);
CFStringGetCString
(
ref
,
name
,
sizeof
(
name
),
kCFStringEncodingUTF8
);
CFRelease
(
ref
);
list
.
push_back
(
name
);
}
return
list
;
}
MIDIDriverCoreMidi
::
MIDIDriverCoreMidi
()
{
client
=
0
;
...
...
drivers/coremidi/core_midi.h
View file @
05fc12dd
...
...
@@ -53,6 +53,8 @@ public:
virtual
Error
open
();
virtual
void
close
();
PoolStringArray
get_connected_inputs
();
MIDIDriverCoreMidi
();
virtual
~
MIDIDriverCoreMidi
();
};
...
...
drivers/winmidi/win_midi.cpp
View file @
05fc12dd
...
...
@@ -53,6 +53,12 @@ Error MIDIDriverWinMidi::open() {
char
err
[
256
];
midiInGetErrorText
(
res
,
err
,
256
);
ERR_PRINTS
(
"midiInOpen error: "
+
String
(
err
));
MIDIINCAPS
caps
;
res
=
midiInGetDevCaps
(
i
,
&
caps
,
sizeof
(
MIDIINCAPS
));
if
(
res
==
MMSYSERR_NOERROR
)
{
ERR_PRINTS
(
"Can't open MIDI device
\"
"
+
String
(
caps
.
szPname
)
+
"
\"
, is it being used by another application?"
);
}
}
}
...
...
platform/osx/os_osx.mm
View file @
05fc12dd
...
...
@@ -1351,8 +1351,6 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
AudioDriverManager::initialize(p_audio_driver);
midi_driver.open();
input = memnew(InputDefault);
joypad_osx = memnew(JoypadOSX);
...
...
@@ -1370,6 +1368,8 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
void OS_OSX::finalize() {
midi_driver.close();
CFNotificationCenterRemoveObserver(CFNotificationCenterGetDistributedCenter(), NULL, kTISNotifySelectedKeyboardInputSourceChanged, NULL);
CGDisplayRemoveReconfigurationCallback(displays_arrangement_changed, NULL);
...
...
platform/windows/os_windows.cpp
View file @
05fc12dd
...
...
@@ -1219,10 +1219,6 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int
AudioDriverManager
::
initialize
(
p_audio_driver
);
#ifdef WINMIDI_ENABLED
driver_midi
.
open
();
#endif
TRACKMOUSEEVENT
tme
;
tme
.
cbSize
=
sizeof
(
TRACKMOUSEEVENT
);
tme
.
dwFlags
=
TME_LEAVE
;
...
...
platform/x11/os_x11.cpp
View file @
05fc12dd
...
...
@@ -342,10 +342,6 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
AudioDriverManager
::
initialize
(
p_audio_driver
);
#ifdef ALSAMIDI_ENABLED
driver_alsamidi
.
open
();
#endif
ERR_FAIL_COND_V
(
!
visual_server
,
ERR_UNAVAILABLE
);
ERR_FAIL_COND_V
(
x11_window
==
0
,
ERR_UNAVAILABLE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment