Skip to content

Commit b114772

Browse files
committed
'a
1 parent df70604 commit b114772

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/app.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ pub mod main_loop;
77
pub mod playlist;
88
pub 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

2020
pub 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();

src/app/audio.rs

+2-2
Original file line numberDiff line numberDiff 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

src/app/config.rs

+1-1
Original file line numberDiff line numberDiff 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 {

src/app/main_loop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use sdl2::keyboard::Keycode;
55
use crate::app::App;
66
use 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();

0 commit comments

Comments
 (0)