From 7c9c01d3ea275d31d3132e84d41e1b8f3306082f Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Wed, 30 Jun 2021 20:28:29 +0200 Subject: [PATCH] Update to newest gtk-rs crates Some things were adapted accordingly and some warnings from clippy were fixed along the way. --- Cargo.lock | 589 ++++++++++++++++++++--------------------- backend/Cargo.toml | 8 +- backend/src/lib.rs | 7 +- backend/src/library.rs | 9 +- backend/src/player.rs | 34 +-- import/Cargo.toml | 6 +- import/src/disc.rs | 55 ++-- import/src/folder.rs | 26 +- musicus/Cargo.toml | 31 +-- 9 files changed, 359 insertions(+), 406 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 155e3b1..a70c7f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" [[package]] name = "async-channel" @@ -72,7 +72,7 @@ dependencies = [ "parking", "polling", "slab", - "socket2 0.4.0", + "socket2", "waker-fn", "winapi", ] @@ -157,31 +157,33 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cairo-rs" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d32eecb1e806433cf68063c4548bbdc15cc56d35db19d685ab60909c4c85206" dependencies = [ "bitflags", "cairo-sys-rs", - "glib 0.13.0", + "glib 0.14.0", "libc", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c9c3928781e8a017ece15eace05230f04b647457d170d2d9641c94a444ff80" dependencies = [ - "glib-sys 0.13.0", + "glib-sys 0.14.0", "libc", "system-deps 3.1.1", ] [[package]] name = "cc" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" [[package]] name = "cfg-expr" @@ -224,20 +226,19 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.1.1" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec1028182c380cc45a2e2c5ec841134f2dfd0f8f5f0a5bcd68004f81b5efdf4" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" dependencies = [ "libc", ] [[package]] name = "crossbeam-utils" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg", "cfg-if 1.0.0", "lazy_static", ] @@ -254,24 +255,24 @@ dependencies = [ [[package]] name = "curl" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a872858e9cb9e3b96c80dd78774ad9e32e44d3b05dc31e142b858d14aebc82c" +checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.3.19", + "socket2", "winapi", ] [[package]] name = "curl-sys" -version = "0.4.42+curl-7.76.0" +version = "0.4.44+curl-7.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4636d8d6109c842707018a104051436bffb8991ea20b2d1293db70b6e0ee4c7c" +checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" dependencies = [ "cc", "libc", @@ -306,9 +307,9 @@ dependencies = [ [[package]] name = "diesel" -version = "1.4.6" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" +checksum = "bba51ca66f57261fd17cadf8b73e4775cc307d0521d855de3f5de91a8f074e0e" dependencies = [ "byteorder", "diesel_derives", @@ -398,9 +399,9 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf539fba70056b50f40a22e0da30639518a12ee18c35807858a63b158cb6dde7" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ "memoffset", "rustc_version", @@ -430,9 +431,9 @@ checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" [[package]] name = "futures" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -445,9 +446,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -455,15 +456,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-executor" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -472,15 +473,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-lite" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "fastrand", "futures-core", @@ -493,10 +494,11 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg", "proc-macro-hack", "proc-macro2", "quote", @@ -505,22 +507,23 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-util" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg", "futures-channel", "futures-core", "futures-io", @@ -537,23 +540,25 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534192cb8f01daeb8fab2c8d4baa8f9aae5b7a39130525779f5c2608e235b10f" dependencies = [ "gdk-pixbuf-sys", - "gio 0.13.0", - "glib 0.13.0", + "gio", + "glib 0.14.0", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590" dependencies = [ - "gio-sys 0.13.0", - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "gio-sys", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", "system-deps 3.1.1", ] @@ -561,14 +566,15 @@ dependencies = [ [[package]] name = "gdk4" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03132f21de5fe15ded4f950328fb44e007037aea7c6bbbc3f082493d5d3c164" dependencies = [ "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", - "gio 0.13.0", - "glib 0.13.0", + "gio", + "glib 0.14.0", "libc", "pango", ] @@ -576,13 +582,14 @@ dependencies = [ [[package]] name = "gdk4-sys" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3453f8dc11a6167a7269355fcfbd6b96d10625395e87f77199e7dbba9077b58c" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys 0.13.0", - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "gio-sys", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "graphene-sys", "libc", "pango-sys", @@ -612,9 +619,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", @@ -642,36 +649,16 @@ dependencies = [ [[package]] name = "gio" -version = "0.9.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" -dependencies = [ - "bitflags", - "futures", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys 0.10.1", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +checksum = "86c6823b39d46d22cac2466de261f28d7f049ebc18f7b35296a42c7ed8a88325" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", - "gio-sys 0.13.0", - "glib 0.13.0", + "gio-sys", + "glib 0.14.0", "libc", "once_cell", "thiserror", @@ -679,24 +666,12 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.10.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" +checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "system-deps 1.3.2", - "winapi", -] - -[[package]] -name = "gio-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" -dependencies = [ - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", "system-deps 3.1.1", "winapi", @@ -723,17 +698,18 @@ dependencies = [ [[package]] name = "glib" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0028bbfd270d0778540294abca11141d59cb474da4c1f61ca1e11f579c49247" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-executor", "futures-task", - "glib-macros 0.13.0", - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "glib-macros 0.14.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", "once_cell", "smallvec", @@ -757,8 +733,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eb7bdf41972a6f6dab5d72c23d22789f400059a43ba0d72b4bb2f8664d946a9" dependencies = [ "anyhow", "heck", @@ -781,8 +758,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae" dependencies = [ "libc", "system-deps 3.1.1", @@ -801,30 +779,33 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5" dependencies = [ - "glib-sys 0.13.0", + "glib-sys 0.14.0", "libc", "system-deps 3.1.1", ] [[package]] name = "graphene-rs" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1460a39f06e491e6112f27e71e51435c833ba370723224dd1743dfd1f201f19" dependencies = [ - "glib 0.13.0", + "glib 0.14.0", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d23fb7a9547e5f072a7e0cd49cd648fedeb786d122b106217511980cbb8962" dependencies = [ - "glib-sys 0.13.0", + "glib-sys 0.14.0", "libc", "pkg-config", "system-deps 3.1.1", @@ -833,12 +814,13 @@ dependencies = [ [[package]] name = "gsk4" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2699e9ff7ba3ca3582043bfd45ea3af3c45fa461fea75a369bcc6ab77eacde2" dependencies = [ "bitflags", "cairo-rs", "gdk4", - "glib 0.13.0", + "glib 0.14.0", "graphene-rs", "gsk4-sys", "libc", @@ -848,12 +830,13 @@ dependencies = [ [[package]] name = "gsk4-sys" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27cf692f33ec2f438a89cb57018f57260b73193929da9d37b873e47a7662a7e0" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "graphene-sys", "libc", "pango-sys", @@ -862,22 +845,21 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.16.7" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" +checksum = "a2163b09b359d8b651d627d9c83dcce5550929ad678b8ce7ec750787affa93ec" dependencies = [ "bitflags", "cfg-if 1.0.0", "futures-channel", "futures-core", "futures-util", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib 0.14.0", "gstreamer-sys", "libc", "muldiv", - "num-rational", + "num-integer", + "num-rational 0.4.0", "once_cell", "paste", "pretty-hex", @@ -886,138 +868,127 @@ dependencies = [ [[package]] name = "gstreamer-audio-sys" -version = "0.9.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b614d5e478ad2ff6f5699757d03f11f2868ea43164c651c60449bd0e3c6b7d75" +checksum = "d066ddfd05f63836f35ac4a5830d5bb2f7f3d6c33c870e9b15c667d20f65d7f6" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 1.3.2", + "system-deps 3.1.1", ] [[package]] name = "gstreamer-base" -version = "0.16.5" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" +checksum = "5cf50118e1933d9e9e043036f2306d0b9660182ea61a75f266cd9fb3607b7a19" dependencies = [ "bitflags", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "cfg-if 1.0.0", + "glib 0.14.0", "gstreamer", "gstreamer-base-sys", - "gstreamer-sys", "libc", ] [[package]] name = "gstreamer-base-sys" -version = "0.9.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" +checksum = "28169a7b58edb93ad8ac766f0fa12dcd36a2af4257a97ee10194c7103baf3e27" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "gstreamer-sys", "libc", - "system-deps 1.3.2", + "system-deps 3.1.1", ] [[package]] name = "gstreamer-pbutils" -version = "0.16.5" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55ddbc57cf6d4fb1b1f590e723d8fa28a2ebdbdf709cae634c69e273dc006e4" +checksum = "361d0e6bbaf38bac869beaed1177d30960530fbad9355cc3f365b7b31f367a45" dependencies = [ "bitflags", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib 0.14.0", "gstreamer", "gstreamer-pbutils-sys", - "gstreamer-sys", "libc", "thiserror", ] [[package]] name = "gstreamer-pbutils-sys" -version = "0.9.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22af977134e952b1dcb98260f8f2388d7255baa66cf4ebeb2c2c8542093130c5" +checksum = "b6b7507a2c0294755b530e41a402884f326b9dbdc322039aeabac9759c149d65" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "gstreamer-audio-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps 1.3.2", + "system-deps 3.1.1", ] [[package]] name = "gstreamer-player" -version = "0.16.5" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34edf65e48e0d29c18101d77a2e004488a61f81a852a75e19d9c73e03d35cb77" +checksum = "c503dba6f79b5cd8a4be5329119892c196db013ce66fce16079a7df8ce819a3a" dependencies = [ "bitflags", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib 0.14.0", "gstreamer", "gstreamer-player-sys", - "gstreamer-sys", "gstreamer-video", "libc", + "once_cell", ] [[package]] name = "gstreamer-player-sys" -version = "0.9.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53aaf79503e691a32266670bc631edb6c52bdb854984da76a0ce2756f49584a2" +checksum = "3e50bed2a120574750ea1370163df21b50762d0b4967f569fdc58232f4c930d5" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps 1.3.2", + "system-deps 3.1.1", ] [[package]] name = "gstreamer-sys" -version = "0.9.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" +checksum = "8188ba998999a4a16005c3984812807ff882a87f5f3457c3d5bbbfcbdf631ebd" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", - "system-deps 1.3.2", + "system-deps 3.1.1", ] [[package]] name = "gstreamer-video" -version = "0.16.7" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" +checksum = "500442ed0ba5f8f2b28942470b136a3dcb2df93b586e9acdd2d14687ece272ff" dependencies = [ "bitflags", + "cfg-if 1.0.0", "futures-channel", - "futures-util", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib 0.14.0", "gstreamer", "gstreamer-base", - "gstreamer-base-sys", - "gstreamer-sys", "gstreamer-video-sys", "libc", "once_cell", @@ -1025,16 +996,16 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.9.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" +checksum = "b81608f4182bdddd5bd33aaaa341d5544eda12b067a3dab75b1b7d2de01a3ba7" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 1.3.2", + "system-deps 3.1.1", ] [[package]] @@ -1046,7 +1017,8 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" [[package]] name = "gtk4" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8801459abe49508a914c591d0cf355a6aea9762058334ba6efe63bdf40e479" dependencies = [ "bitflags", "cairo-rs", @@ -1054,8 +1026,8 @@ dependencies = [ "futures-channel", "gdk-pixbuf", "gdk4", - "gio 0.13.0", - "glib 0.13.0", + "gio", + "glib 0.14.0", "graphene-rs", "gsk4", "gtk4-macros", @@ -1068,11 +1040,12 @@ dependencies = [ [[package]] name = "gtk4-macros" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca4260cbbdad77f91c57b4836ff63c6c51dc79b2feadc83c0869e4d379dcbee5" dependencies = [ "anyhow", "heck", - "itertools 0.10.0", + "itertools 0.10.1", "proc-macro-crate 1.0.0", "proc-macro-error", "proc-macro2", @@ -1083,14 +1056,15 @@ dependencies = [ [[package]] name = "gtk4-sys" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#e90c5752ba5229f874e912e84bc83739003434ed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580a7215a4d681e068cb1ea93e7293ca0d84b738d9b0c82b630199f21d3c82ef" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.13.0", - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "gio-sys", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "graphene-sys", "gsk4-sys", "libc", @@ -1100,9 +1074,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -1160,15 +1134,16 @@ dependencies = [ [[package]] name = "isahc" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd9294f1ecdda747b8a092b07873285e613adc14e9c9526205eacedcf3ecd2b" +checksum = "81c01404730bb4574bbacb59ca0855f969f8eabd688ca22866f2cc333f1a4f69" dependencies = [ "async-channel", "crossbeam-utils", "curl", "curl-sys", "encoding_rs", + "event-listener", "futures-lite", "http", "log", @@ -1194,9 +1169,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" dependencies = [ "either", ] @@ -1215,13 +1190,14 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#ddc44f4616de5b8820783cf5bf21565d3caab096" +version = "0.1.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52d8221b476b16ee55b18bf4209e0fb5457c66375b9af8f8cef91ff930e82da6" dependencies = [ "gdk-pixbuf", "gdk4", - "gio 0.13.0", - "glib 0.13.0", + "gio", + "glib 0.14.0", "gtk4", "libadwaita-sys", "libc", @@ -1230,14 +1206,15 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.1.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#ddc44f4616de5b8820783cf5bf21565d3caab096" +version = "0.1.0-alpha" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80594e5894e4145639c75164ee33cf607f42c667318475cb1d5db8132b77eab4" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.13.0", - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "gio-sys", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "gtk4-sys", "libc", "pango-sys", @@ -1246,9 +1223,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.94" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "libdbus-sys" @@ -1271,9 +1248,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.20.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" +checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" dependencies = [ "pkg-config", "vcpkg", @@ -1336,9 +1313,9 @@ checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memoffset" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ "autocfg", ] @@ -1382,9 +1359,9 @@ dependencies = [ [[package]] name = "muldiv" -version = "0.2.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" +checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" [[package]] name = "musicus" @@ -1395,8 +1372,8 @@ dependencies = [ "futures-channel", "gdk4", "gettext-rs", - "gio 0.13.0", - "glib 0.13.0", + "gio", + "glib 0.14.0", "gstreamer", "gtk-macros", "gtk4", @@ -1404,7 +1381,6 @@ dependencies = [ "log", "musicus_backend", "once_cell", - "pango", "rand 0.7.3", "sanitize-filename", ] @@ -1414,8 +1390,8 @@ name = "musicus_backend" version = "0.1.0" dependencies = [ "fragile", - "gio 0.9.1", - "glib 0.10.3", + "gio", + "glib 0.14.0", "gstreamer", "gstreamer-player", "log", @@ -1460,7 +1436,7 @@ name = "musicus_import" version = "0.1.0" dependencies = [ "base64", - "glib 0.13.0", + "glib 0.14.0", "gstreamer", "gstreamer-pbutils", "log", @@ -1478,7 +1454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15" dependencies = [ "libc", - "socket2 0.4.0", + "socket2", ] [[package]] @@ -1504,7 +1480,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.3.2", "num-traits", ] @@ -1561,6 +1537,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.14" @@ -1601,9 +1588,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "opaque-debug" @@ -1613,15 +1600,15 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg", "cc", @@ -1632,11 +1619,12 @@ dependencies = [ [[package]] name = "pango" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415823a4fb9f1789785cd6e2d2413816f2ecff92380382969aaca9c400e13a19" dependencies = [ "bitflags", - "glib 0.13.0", + "glib 0.14.0", "libc", "once_cell", "pango-sys", @@ -1644,11 +1632,12 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs/#5dc0f087d1e56b7c31f968fed575924e58ebaece" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe" dependencies = [ - "glib-sys 0.13.0", - "gobject-sys 0.13.0", + "glib-sys 0.14.0", + "gobject-sys 0.14.0", "libc", "system-deps 3.1.1", ] @@ -1720,14 +1709,14 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "polling" -version = "2.0.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" +checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" dependencies = [ "cfg-if 1.0.0", "libc", "log", - "wepoll-sys", + "wepoll-ffi", "winapi", ] @@ -1800,9 +1789,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -1831,14 +1820,14 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -1853,12 +1842,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1872,11 +1861,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.2", + "getrandom 0.2.3", ] [[package]] @@ -1890,11 +1879,11 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -1966,7 +1955,7 @@ dependencies = [ "hkdf", "lazy_static", "num", - "rand 0.8.3", + "rand 0.8.4", "serde", "sha2", "zbus", @@ -1995,18 +1984,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -2026,9 +2015,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" +checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" dependencies = [ "proc-macro2", "quote", @@ -2037,9 +2026,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f6b75b17576b792bef0db1bcc4b8b8bcdf9506744cf34b974195487af6cff2" +checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ "block-buffer", "cfg-if 1.0.0", @@ -2071,17 +2060,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.4.0" @@ -2092,6 +2070,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strum" version = "0.18.0" @@ -2136,9 +2120,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" dependencies = [ "proc-macro2", "quote", @@ -2169,7 +2153,7 @@ dependencies = [ "anyhow", "cfg-expr", "heck", - "itertools 0.10.0", + "itertools 0.10.1", "pkg-config", "strum 0.20.0", "strum_macros 0.20.1", @@ -2180,18 +2164,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" dependencies = [ "proc-macro2", "quote", @@ -2215,9 +2199,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5" +checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2" dependencies = [ "autocfg", "pin-project-lite", @@ -2298,9 +2282,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] @@ -2335,14 +2319,14 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.2", + "getrandom 0.2.3", ] [[package]] name = "vcpkg" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" @@ -2387,10 +2371,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] -name = "wepoll-sys" -version = "3.0.1" +name = "wepoll-ffi" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" dependencies = [ "cc", ] @@ -2454,23 +2438,24 @@ dependencies = [ [[package]] name = "zvariant" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678e7262502a135f49b1ece65010526649be7ee68acb80e1fc5377fc71fef878" +checksum = "fa9a0fc1c0ea8400723fdaddd3b381147d50991a40da39e6ea935b7d63204722" dependencies = [ "byteorder", "enumflags2", "serde", + "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d7c34325a35020b94343389cc9391e0f8ac245cca9155429c4022d93141241" +checksum = "4cf1d7953d902d1bad61878a7c79bd224d4a83bdfc93c84cc703ec760b8b70e9" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate 1.0.0", "proc-macro2", "quote", "syn", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 1186c08..ad03b93 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -5,10 +5,10 @@ edition = "2018" [dependencies] fragile = "1.0.0" -gio = "0.9.1" -glib = "0.10.3" -gstreamer = "0.16.4" -gstreamer-player = "0.16.3" +gio = "0.14.0" +glib = "0.14.0" +gstreamer = "0.17.0" +gstreamer-player = "0.17.0" log = { version = "0.4.14", features = ["std"] } musicus_client = { version = "0.1.0", path = "../client" } musicus_database = { version = "0.1.0", path = "../database" } diff --git a/backend/src/lib.rs b/backend/src/lib.rs index f6ef3ff..bac630c 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -102,10 +102,9 @@ impl Backend { pub async fn init(&self) -> Result<()> { self.init_library().await?; - if let Some(url) = self.settings.get_string("server-url") { - if !url.is_empty() { - self.client.set_server_url(&url); - } + let url = self.settings.string("server-url"); + if !url.is_empty() { + self.client.set_server_url(&url); } #[cfg(all(feature = "dbus"))] diff --git a/backend/src/library.rs b/backend/src/library.rs index 7c5d852..6f1775d 100644 --- a/backend/src/library.rs +++ b/backend/src/library.rs @@ -8,11 +8,10 @@ use std::rc::Rc; impl Backend { /// Initialize the music library if it is set in the settings. pub(super) async fn init_library(&self) -> Result<()> { - if let Some(path) = self.settings.get_string("music-library-path") { - if !path.is_empty() { - self.set_music_library_path_priv(PathBuf::from(path.to_string())) - .await?; - } + let path = self.settings.string("music-library-path"); + if !path.is_empty() { + self.set_music_library_path_priv(PathBuf::from(path.to_string())) + .await?; } Ok(()) diff --git a/backend/src/player.rs b/backend/src/player.rs index 9c9cbed..8eaf0fc 100644 --- a/backend/src/player.rs +++ b/backend/src/player.rs @@ -31,7 +31,7 @@ impl Player { pub fn new(music_library_path: PathBuf) -> Rc { let dispatcher = gstreamer_player::PlayerGMainContextSignalDispatcher::new(None); let player = gstreamer_player::Player::new(None, Some(&dispatcher.upcast())); - let mut config = player.get_config(); + let mut config = player.config(); config.set_position_update_interval(250); player.set_config(config).unwrap(); player.set_video_track_enabled(false); @@ -88,14 +88,14 @@ impl Player { let clone = fragile::Fragile::new(result.clone()); player.connect_position_updated(move |_, position| { for cb in &*clone.get().position_cbs.borrow() { - cb(position.mseconds().unwrap()); + cb(position.unwrap().mseconds()); } }); let clone = fragile::Fragile::new(result.clone()); player.connect_duration_changed(move |_, duration| { for cb in &*clone.get().duration_cbs.borrow() { - cb(duration.mseconds().unwrap()); + cb(duration.unwrap().mseconds()); } }); @@ -172,8 +172,8 @@ impl Player { self.current_track.get() } - pub fn get_duration(&self) -> gstreamer::ClockTime { - self.player.get_duration() + pub fn get_duration(&self) -> Option { + self.player.duration() } pub fn is_playing(&self) -> bool { @@ -250,9 +250,11 @@ impl Player { } pub fn previous(&self) -> Result<()> { - let mut current_track = self.current_track.get().ok_or(Error::Other(String::from( - "Player tried to access non existant current track.", - )))?; + let mut current_track = self.current_track.get().ok_or_else(|| { + Error::Other(String::from( + "Player tried to access non existant current track.", + )) + })?; if current_track > 0 { current_track -= 1; @@ -273,9 +275,11 @@ impl Player { } pub fn next(&self) -> Result<()> { - let mut current_track = self.current_track.get().ok_or(Error::Other(String::from( - "Player tried to access non existant current track.", - )))?; + let mut current_track = self.current_track.get().ok_or_else(|| { + Error::Other(String::from( + "Player tried to access non existant current track.", + )) + })?; let playlist = self.playlist.borrow(); @@ -298,10 +302,8 @@ impl Player { .into_string() .unwrap(); - let uri = glib::filename_to_uri(&path, None).or(Err(Error::Other(format!( - "Failed to create URI from path: {}", - path - ))))?; + let uri = glib::filename_to_uri(&path, None) + .map_err(|_| Error::Other(format!("Failed to create URI from path: {}", path)))?; self.player.set_uri(&uri); @@ -351,7 +353,7 @@ impl Player { } for cb in &*self.duration_cbs.borrow() { - cb(self.player.get_duration().mseconds().unwrap()); + cb(self.player.duration().unwrap().mseconds()); } for cb in &*self.playing_cbs.borrow() { diff --git a/import/Cargo.toml b/import/Cargo.toml index 2319ce4..6c4b318 100644 --- a/import/Cargo.toml +++ b/import/Cargo.toml @@ -5,9 +5,9 @@ edition = "2018" [dependencies] base64 = "0.13.0" -glib = { git = "https://github.com/gtk-rs/gtk-rs/", features = ["v2_64"] } -gstreamer = "0.16.5" -gstreamer-pbutils = "0.16.5" +glib = "0.14.0" +gstreamer = "0.17.0" +gstreamer-pbutils = "0.17.0" log = "0.4.14" once_cell = "1.5.2" rand = "0.7.3" diff --git a/import/src/disc.rs b/import/src/disc.rs index 763b207..670a9c0 100644 --- a/import/src/disc.rs +++ b/import/src/disc.rs @@ -29,8 +29,8 @@ pub(super) fn new() -> Result { gstreamer::Element::link_many(&[&cdparanoiasrc, &queue, &audioconvert, &flacenc, &fakesink])?; let bus = pipeline - .get_bus() - .ok_or(Error::u(String::from("Failed to get bus from pipeline.")))?; + .bus() + .ok_or_else(|| Error::u(String::from("Failed to get bus from pipeline.")))?; // Run the pipeline into the paused state and wait for the resulting TOC message on the bus. @@ -38,21 +38,21 @@ pub(super) fn new() -> Result { let msg = bus.timed_pop_filtered( ClockTime::from_seconds(5), - &vec![MessageType::Toc, MessageType::Error], + &[MessageType::Toc, MessageType::Error], ); let toc = match msg { Some(msg) => match msg.view() { - MessageView::Error(err) => Err(Error::os(err.get_error())), - MessageView::Toc(toc) => Ok(toc.get_toc().0), + MessageView::Error(err) => Err(Error::os(err.error())), + MessageView::Toc(toc) => Ok(toc.toc().0), _ => Err(Error::u(format!( "Unexpected message from GStreamer: {:?}", msg ))), }, - None => Err(Error::Timeout(format!( - "Timeout while waiting for first message from GStreamer." - ))), + None => Err(Error::Timeout( + "Timeout while waiting for first message from GStreamer.".to_string(), + )), }?; pipeline.set_state(gstreamer::State::Ready)?; @@ -72,33 +72,22 @@ pub(super) fn new() -> Result { let tmp_dir = create_tmp_dir()?; - for entry in toc.get_entries() { - if entry.get_entry_type() == TocEntryType::Track { + for entry in toc.entries() { + if entry.entry_type() == TocEntryType::Track { let duration = entry - .get_tags() - .ok_or(Error::u(String::from("No tags in TOC entry.")))? + .tags() + .ok_or_else(|| Error::u(String::from("No tags in TOC entry.")))? .get::() - .ok_or(Error::u(String::from( - "No duration tag found in TOC entry.", - )))? + .ok_or_else(|| Error::u(String::from("No duration tag found in TOC entry.")))? .get() - .ok_or(Error::u(String::from( - "Failed to unwrap duration tag from TOC entry.", - )))? - .mseconds() - .ok_or(Error::u(String::from("Failed to unwrap track duration.")))?; + .mseconds(); let number = entry - .get_tags() - .ok_or(Error::u(String::from("No tags in TOC entry.")))? + .tags() + .ok_or_else(|| Error::u(String::from("No tags in TOC entry.")))? .get::() - .ok_or(Error::u(String::from( - "No track number tag found in TOC entry.", - )))? - .get() - .ok_or(Error::u(String::from( - "Failed to unwrap track number tag from TOC entry.", - )))?; + .ok_or_else(|| Error::u(String::from("No track number tag found in TOC entry.")))? + .get(); hasher.update(duration.to_le_bytes()); @@ -140,7 +129,7 @@ pub(super) fn new() -> Result { // This will also affect the filesink as expected. pipeline.set_state(gstreamer::State::Playing)?; - for msg in bus.iter_timed(ClockTime::none()) { + for msg in bus.iter_timed(None) { match msg.view() { MessageView::Eos(..) => { info!("Finished ripping track {}.", track.number); @@ -149,7 +138,7 @@ pub(super) fn new() -> Result { } MessageView::Error(err) => { pipeline.set_state(gstreamer::State::Null)?; - Err(Error::os(err.get_error()))?; + return Err(Error::os(err.error())); } _ => (), } @@ -174,9 +163,7 @@ pub(super) fn new() -> Result { /// Create a new temporary directory and return its path. fn create_tmp_dir() -> Result { - let mut tmp_dir = glib::tmp_dir().ok_or(Error::u(String::from( - "Failed to get temporary directory using glib::get_tmp_dir().", - )))?; + let mut tmp_dir = glib::tmp_dir(); let dir_name = format!("musicus-{}", rand::random::()); tmp_dir.push(dir_name); diff --git a/import/src/folder.rs b/import/src/folder.rs index d629dd0..313db01 100644 --- a/import/src/folder.rs +++ b/import/src/folder.rs @@ -19,30 +19,30 @@ pub(super) fn new(path: PathBuf) -> Result { let mut entries = std::fs::read_dir(path)?.collect::, std::io::Error>>()?; - entries.sort_by(|entry1, entry2| entry1.file_name().cmp(&entry2.file_name())); + entries.sort_by_key(|entry| entry.file_name()); for entry in entries { if entry.file_type()?.is_file() { let path = entry.path(); - let uri = glib::filename_to_uri(&path, None).or(Err(Error::u(format!( - "Failed to create URI from path: {:?}", - path - ))))?; + let uri = glib::filename_to_uri(&path, None) + .map_err(|_| Error::u(format!("Failed to create URI from path: {:?}", path)))?; let info = discoverer.discover_uri(&uri)?; - if !info.get_audio_streams().is_empty() { + if !info.audio_streams().is_empty() { let duration = info - .get_duration() - .mseconds() - .ok_or(Error::u(format!("Failed to get duration for {}.", uri)))?; + .duration() + .ok_or_else(|| Error::u(format!("Failed to get duration for {}.", uri)))? + .mseconds(); let file_name = entry.file_name(); - let name = file_name.into_string().or(Err(Error::u(format!( - "Failed to convert OsString to String: {:?}", - entry.file_name() - ))))?; + let name = file_name.into_string().map_err(|_| { + Error::u(format!( + "Failed to convert OsString to String: {:?}", + entry.file_name() + )) + })?; hasher.update(duration.to_le_bytes()); diff --git a/musicus/Cargo.toml b/musicus/Cargo.toml index 370eacd..8b09281 100644 --- a/musicus/Cargo.toml +++ b/musicus/Cargo.toml @@ -5,37 +5,18 @@ edition = "2018" [dependencies] anyhow = "1.0.33" +adw = { package = "libadwaita", version = "0.1.0-alpha" } async-trait = "0.1.42" futures-channel = "0.3.5" +gdk = { package = "gdk4", version = "0.1.0" } gettext-rs = { version = "0.5.0", features = ["gettext-system"] } -gstreamer = "0.16.4" +gio = "0.14.0" +glib = "0.14.0" +gstreamer = "0.17.0" +gtk = { package = "gtk4", version = "0.1.0" } gtk-macros = "0.3.0" log = "0.4.14" musicus_backend = { version = "0.1.0", path = "../backend" } once_cell = "1.5.2" rand = "0.7.3" sanitize-filename = "0.3.0" - -[dependencies.gdk] -git = "https://github.com/gtk-rs/gtk4-rs/" -package = "gdk4" - -[dependencies.gio] -git = "https://github.com/gtk-rs/gtk-rs/" -features = ["v2_64"] - -[dependencies.glib] -git = "https://github.com/gtk-rs/gtk-rs/" -features = ["v2_64"] - -[dependencies.gtk] -git = "https://github.com/gtk-rs/gtk4-rs" -package = "gtk4" - -[dependencies.adw] -git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git" -package = "libadwaita" - -[dependencies.pango] -git = "https://github.com/gtk-rs/gtk-rs/" -features = ["v1_44"]