@@ -13,8 +13,8 @@ impl listener::ListenerHandler for &Synchronizer {
13
13
tracing:: info!( "{}" , match self . connect_all( ) ? {
14
14
( true , true ) => "Waiting for more MIDI sources" ,
15
15
( true , false ) => "Waiting for MIDI sources" ,
16
- ( false , true ) => "Waiting for a synthetizer " ,
17
- ( false , false ) => "Waiting for a synthetizer and MIDI sources" ,
16
+ ( false , true ) => "Waiting for a synthesizer " ,
17
+ ( false , false ) => "Waiting for a synthesizer and MIDI sources" ,
18
18
} ) ;
19
19
20
20
Ok ( ( ) )
@@ -45,8 +45,8 @@ impl Synchronizer {
45
45
fn auto_connect ( & self , addr : alsa:: seq:: Addr ) -> Res < ( ) > {
46
46
let port_info = self . seq . port_info ( addr) ?;
47
47
48
- if Synchronizer :: is_synthetizer ( & port_info) {
49
- self . detected ( "Synthetizer " , & port_info) ?;
48
+ if Synchronizer :: is_synthesizer ( & port_info) {
49
+ self . detected ( "Synthesizer " , & port_info) ?;
50
50
51
51
let mut no_midi_sources = true ;
52
52
@@ -61,10 +61,10 @@ impl Synchronizer {
61
61
} else if Synchronizer :: is_midi_source ( & port_info) {
62
62
self . detected ( "Midi source" , & port_info) ?;
63
63
64
- if let Some ( synthetizer ) = self . synthetizer ( ) {
65
- self . connect ( port_info. addr ( ) , synthetizer . addr ( ) ) . expect ( "connection failed" ) ;
64
+ if let Some ( synthesizer ) = self . synthesizer ( ) {
65
+ self . connect ( port_info. addr ( ) , synthesizer . addr ( ) ) . expect ( "connection failed" ) ;
66
66
} else {
67
- tracing:: warn!( "Cannot connect: no synthetizer available" ) ;
67
+ tracing:: warn!( "Cannot connect: no synthesizer available" ) ;
68
68
}
69
69
} else {
70
70
self . detected ( "Unknown seq port" , & port_info) ?;
@@ -77,12 +77,12 @@ impl Synchronizer {
77
77
let midi_sources : Vec < _ > = self . midi_sources ( ) . collect ( ) ;
78
78
let no_midi_sources = midi_sources. is_empty ( ) ;
79
79
80
- if let Some ( synthetizer ) = self . synthetizer ( ) {
81
- self . detected ( "Synthetizer " , & synthetizer ) ?;
80
+ if let Some ( synthesizer ) = self . synthesizer ( ) {
81
+ self . detected ( "Synthesizer " , & synthesizer ) ?;
82
82
83
83
for midi_source in midi_sources {
84
84
self . detected ( "Midi source" , & midi_source) ?;
85
- self . connect ( midi_source. addr ( ) , synthetizer . addr ( ) ) . expect ( "connection failed" ) ;
85
+ self . connect ( midi_source. addr ( ) , synthesizer . addr ( ) ) . expect ( "connection failed" ) ;
86
86
}
87
87
88
88
if no_midi_sources {
@@ -91,7 +91,7 @@ impl Synchronizer {
91
91
92
92
Ok ( ( true , !no_midi_sources) )
93
93
} else {
94
- tracing:: warn!( "Cannot connect: no synthetizer available" ) ;
94
+ tracing:: warn!( "Cannot connect: no synthesizer available" ) ;
95
95
96
96
for midi_source in midi_sources {
97
97
self . detected ( "Midi source" , & midi_source) ?;
@@ -105,8 +105,8 @@ impl Synchronizer {
105
105
}
106
106
}
107
107
108
- fn connect ( & self , sender : alsa:: seq:: Addr , synthetizer : alsa:: seq:: Addr ) -> Res < ( bool , alsa:: seq:: PortSubscribe ) > {
109
- self . seq . connect ( sender, synthetizer ) . and_then ( |( new, port_subscribe) | {
108
+ fn connect ( & self , sender : alsa:: seq:: Addr , synthesizer : alsa:: seq:: Addr ) -> Res < ( bool , alsa:: seq:: PortSubscribe ) > {
109
+ self . seq . connect ( sender, synthesizer ) . and_then ( |( new, port_subscribe) | {
110
110
if new {
111
111
tracing:: info!(
112
112
"{} has been connected to {}" ,
@@ -123,15 +123,15 @@ impl Synchronizer {
123
123
} )
124
124
}
125
125
126
- fn synthetizer ( & self ) -> Option < alsa:: seq:: PortInfo > {
127
- self . seq . ports ( ) . find ( Synchronizer :: is_synthetizer )
126
+ fn synthesizer ( & self ) -> Option < alsa:: seq:: PortInfo > {
127
+ self . seq . ports ( ) . find ( Synchronizer :: is_synthesizer )
128
128
}
129
129
130
130
fn midi_sources ( & self ) -> impl Iterator < Item =alsa:: seq:: PortInfo > + ' _ {
131
131
self . seq . ports ( ) . filter ( Synchronizer :: is_midi_source)
132
132
}
133
133
134
- fn is_synthetizer ( port_info : & alsa:: seq:: PortInfo ) -> bool {
134
+ fn is_synthesizer ( port_info : & alsa:: seq:: PortInfo ) -> bool {
135
135
port_info. get_type ( ) . contains ( alsa:: seq:: PortType :: SYNTHESIZER )
136
136
}
137
137
0 commit comments