File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 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;
77pub mod playlist;
88pub mod video;
99
10- pub struct App < ' a > {
10+ pub struct App {
1111 pm : projectm_handle ,
1212 playlist : projectm_rs:: playlist:: Playlist ,
1313 sdl_context : sdl2:: Sdl ,
1414 gl_context : sdl2:: video:: GLContext ,
1515 window : sdl2:: video:: Window ,
1616 config : config:: Config ,
17- audio : audio:: Audio < ' a > ,
17+ audio : audio:: Audio ,
1818}
1919
2020pub fn default_config ( ) -> config:: Config {
2121 config:: Config :: default ( )
2222}
2323
24- impl App < ' _ > {
24+ impl App {
2525 pub fn new ( config : Option < crate :: app:: config:: Config > ) -> Self {
2626 // setup sdl
2727 let sdl_context = sdl2:: init ( ) . unwrap ( ) ;
Original file line number Diff line number Diff line change @@ -7,14 +7,14 @@ pub struct AudioCaptureDevice {
77 index : AudioDeviceIndex ,
88}
99
10- pub struct Audio < ' a > {
10+ pub struct Audio {
1111 audio_subsystem : sdl2:: AudioSubsystem ,
1212 audio_device_index : AudioDeviceIndex , // device_list: Option<Vec<sdl2::audio::AudioDevice>>,
1313 frame_rate : Option < u32 > ,
1414 capturing_device : Option < AudioDevice < AudioCaptureCallback > > ,
1515}
1616
17- impl Audio < ' _ > {
17+ impl Audio {
1818 pub fn new ( sdl_context : & sdl2:: Sdl ) -> Self {
1919 let audio_subsystem = sdl_context. audio ( ) . unwrap ( ) ;
2020
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ impl Default for Config {
1616 }
1717}
1818
19- impl App < ' _ > {
19+ impl App {
2020 pub fn load_config ( & self , config : & Config ) {
2121 // load presets if provided
2222 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;
55use crate :: app:: App ;
66use crate :: dummy_audio;
77
8- impl App < ' _ > {
8+ impl App {
99 pub fn main_loop ( & mut self ) {
1010 let config = & self . config ;
1111 let frame_rate = config. frame_rate . unwrap ( ) ;
You can’t perform that action at this time.
0 commit comments