File tree 4 files changed +7
-7
lines changed
4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -7,21 +7,21 @@ pub mod main_loop;
7
7
pub mod playlist;
8
8
pub mod video;
9
9
10
- pub struct App < ' a > {
10
+ pub struct App {
11
11
pm : projectm_handle ,
12
12
playlist : projectm_rs:: playlist:: Playlist ,
13
13
sdl_context : sdl2:: Sdl ,
14
14
gl_context : sdl2:: video:: GLContext ,
15
15
window : sdl2:: video:: Window ,
16
16
config : config:: Config ,
17
- audio : audio:: Audio < ' a > ,
17
+ audio : audio:: Audio ,
18
18
}
19
19
20
20
pub fn default_config ( ) -> config:: Config {
21
21
config:: Config :: default ( )
22
22
}
23
23
24
- impl App < ' _ > {
24
+ impl App {
25
25
pub fn new ( config : Option < crate :: app:: config:: Config > ) -> Self {
26
26
// setup sdl
27
27
let sdl_context = sdl2:: init ( ) . unwrap ( ) ;
Original file line number Diff line number Diff line change @@ -7,14 +7,14 @@ pub struct AudioCaptureDevice {
7
7
index : AudioDeviceIndex ,
8
8
}
9
9
10
- pub struct Audio < ' a > {
10
+ pub struct Audio {
11
11
audio_subsystem : sdl2:: AudioSubsystem ,
12
12
audio_device_index : AudioDeviceIndex , // device_list: Option<Vec<sdl2::audio::AudioDevice>>,
13
13
frame_rate : Option < u32 > ,
14
14
capturing_device : Option < AudioDevice < AudioCaptureCallback > > ,
15
15
}
16
16
17
- impl Audio < ' _ > {
17
+ impl Audio {
18
18
pub fn new ( sdl_context : & sdl2:: Sdl ) -> Self {
19
19
let audio_subsystem = sdl_context. audio ( ) . unwrap ( ) ;
20
20
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ impl Default for Config {
16
16
}
17
17
}
18
18
19
- impl App < ' _ > {
19
+ impl App {
20
20
pub fn load_config ( & self , config : & Config ) {
21
21
// load presets if provided
22
22
if let Some ( preset_path) = & config. preset_path {
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ use sdl2::keyboard::Keycode;
5
5
use crate :: app:: App ;
6
6
use crate :: dummy_audio;
7
7
8
- impl App < ' _ > {
8
+ impl App {
9
9
pub fn main_loop ( & mut self ) {
10
10
let config = & self . config ;
11
11
let frame_rate = config. frame_rate . unwrap ( ) ;
You can’t perform that action at this time.
0 commit comments