Update dependencies, adapt code, fix warnings

This commit is contained in:
Elias Projahn 2023-03-28 14:39:54 +02:00
parent 75d4e82cf8
commit 835d4f0d42
44 changed files with 595 additions and 541 deletions

View file

@ -6,10 +6,10 @@ edition = "2021"
[dependencies]
chrono = "0.4"
fragile = "2"
gio = "0.16"
glib = "0.16"
gstreamer = "0.19"
gstreamer-player = "0.19"
gio = "0.17"
glib = "0.17"
gstreamer = "0.20"
gstreamer-player = "0.20"
log = { version = "0.4", features = ["std"] }
musicus_database = { version = "0.1.0", path = "../database" }
musicus_import = { version = "0.1.0", path = "../import" }

View file

@ -1,6 +1,9 @@
use chrono::{Local, DateTime};
use chrono::{DateTime, Local};
use log::{Level, LevelFilter, Log, Metadata, Record};
use std::{fmt::Display, sync::{Arc, Mutex}};
use std::{
fmt::Display,
sync::{Arc, Mutex},
};
/// Register the custom logger. This will panic if called more than once.
pub fn register() -> Arc<Logger> {
@ -72,6 +75,10 @@ impl<'a> From<&Record<'a>> for LogMessage {
impl Display for LogMessage {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{} {} ({}): {}", self.time, self.module, self.level, self.message)
write!(
f,
"{} {} ({}): {}",
self.time, self.module, self.level, self.message
)
}
}

View file

@ -1,6 +1,7 @@
use crate::{Backend, Error, Result};
use db::Track;
use glib::clone;
use gstreamer_player::PlayerVideoRenderer;
use musicus_database as db;
use std::cell::{Cell, RefCell};
use std::path::PathBuf;
@ -32,10 +33,7 @@ pub struct Player {
impl Player {
pub fn new(music_library_path: PathBuf) -> Rc<Self> {
let dispatcher = gstreamer_player::PlayerGMainContextSignalDispatcher::new(None);
let player = gstreamer_player::Player::new(
gstreamer_player::PlayerVideoRenderer::NONE,
Some(&dispatcher),
);
let player = gstreamer_player::Player::new(None::<PlayerVideoRenderer>, Some(dispatcher));
let mut config = player.config();
config.set_position_update_interval(250);
player.set_config(config).unwrap();