diff --git a/Cargo.lock b/Cargo.lock index ebe5f5c..644e344 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,18 +4,33 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "anyhow" -version = "1.0.57" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "atomic_refcell" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d" [[package]] name = "autocfg" @@ -25,9 +40,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bitflags" @@ -43,13 +58,19 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ "generic-array", ] +[[package]] +name = "bumpalo" +version = "3.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" + [[package]] name = "byteorder" version = "1.4.3" @@ -58,37 +79,40 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cairo-rs" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" dependencies = [ "bitflags", "cairo-sys-rs", - "glib 0.16.0", + "glib 0.16.7", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "cc" -version = "1.0.73" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" [[package]] name = "cfg-expr" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" dependencies = [ "smallvec", ] @@ -101,36 +125,98 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ - "libc", + "iana-time-zone", + "js-sys", "num-integer", "num-traits", "time", + "wasm-bindgen", "winapi", ] [[package]] -name = "cpufeatures" -version = "0.2.2" +name = "codespan-reporting" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] [[package]] name = "crypto-common" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", "typenum", ] +[[package]] +name = "cxx" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dbus" version = "0.6.5" @@ -175,20 +261,14 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", ] -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - [[package]] name = "field-offset" version = "0.3.4" @@ -201,30 +281,30 @@ dependencies = [ [[package]] name = "fragile" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9d758e60b45e8d749c89c1b389ad8aee550f86aa12e2b9298b546dda7a82ab1" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -233,15 +313,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", @@ -250,15 +330,15 @@ dependencies = [ [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-core", "futures-macro", @@ -270,64 +350,68 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" dependencies = [ "bitflags", "gdk-pixbuf-sys", - "gio 0.16.0", - "glib 0.16.0", + "gio", + "glib 0.16.7", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" dependencies = [ - "gio-sys 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gdk4" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "272db1bbb9b152ea1fea946f9d464085c86cfe14cafba450d7defa433caff8ec" dependencies = [ "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", - "gio 0.16.0", - "glib 0.16.0", + "gio", + "glib 0.16.7", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45b571f36b889ab529b2e173248dafe83d75c703f5685b9845e490c7994ae309" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "pango-sys", "pkg-config", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", "version_check", @@ -335,13 +419,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -366,86 +450,42 @@ dependencies = [ [[package]] name = "gio" -version = "0.15.11" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f132be35e05d9662b9fa0fee3f349c6621f7782e0105917f4cc73c1bf47eceb" +checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-io", - "gio-sys 0.15.10", - "glib 0.15.11", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys 0.16.0", - "glib 0.16.0", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", - "libc", - "system-deps 6.0.2", - "winapi", -] - -[[package]] -name = "gio-sys" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" -dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", - "libc", - "system-deps 6.0.2", - "winapi", -] - -[[package]] -name = "glib" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", "futures-util", - "glib-macros 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "gio-sys", + "glib 0.16.7", "libc", "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +dependencies = [ + "glib-sys 0.16.3", + "gobject-sys 0.16.3", + "libc", + "system-deps", + "winapi", ] [[package]] name = "glib" -version = "0.15.11" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124026a2fa8c33a3d17a3fe59c103f2d9fa5bd92c19e029e037736729abeab" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ "bitflags", "futures-channel", @@ -463,8 +503,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" dependencies = [ "bitflags", "futures-channel", @@ -472,31 +513,16 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "glib-macros 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "gio-sys", + "glib-macros 0.16.3", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "once_cell", "smallvec", "thiserror", ] -[[package]] -name = "glib-macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" -dependencies = [ - "anyhow", - "heck 0.3.3", - "itertools", - "proc-macro-crate 0.1.5", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "glib-macros" version = "0.15.11" @@ -504,8 +530,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" dependencies = [ "anyhow", - "heck 0.4.0", - "proc-macro-crate 1.1.3", + "heck", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -514,28 +540,19 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf" dependencies = [ "anyhow", - "heck 0.4.0", - "proc-macro-crate 1.1.3", + "heck", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", "syn", ] -[[package]] -name = "glib-sys" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" -dependencies = [ - "libc", - "system-deps 1.3.2", -] - [[package]] name = "glib-sys" version = "0.15.10" @@ -543,27 +560,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "glib-sys" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" -dependencies = [ - "libc", - "system-deps 6.0.2", -] - -[[package]] -name = "gobject-sys" -version = "0.10.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ - "glib-sys 0.10.1", "libc", - "system-deps 1.3.2", + "system-deps", ] [[package]] @@ -574,49 +581,53 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys 0.15.10", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gobject-sys" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "graphene-rs" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b" dependencies = [ - "glib 0.16.0", + "glib 0.16.7", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "pkg-config", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gsk4" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4053293b79099bdfecd9ab0d811d118a0eafce613dfe0b26075419d955f1f652" dependencies = [ "bitflags", "cairo-rs", "gdk4", - "glib 0.16.0", + "glib 0.16.7", "graphene-rs", "gsk4-sys", "libc", @@ -625,31 +636,32 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08e0642edffdb35028d7d67b830678da98844216b6442e11eee52c91ad2a6dc2" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "graphene-sys", "libc", "pango-sys", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gstreamer" -version = "0.18.8" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66363bacf5e4f6eb281564adc2902e44c52ae5c45082423e7439e9012b75456" +checksum = "87a7570ad1d3c1cbf64561ada514fe0c03cf834f2076b85ffc616756c840b665" dependencies = [ "bitflags", "cfg-if", "futures-channel", "futures-core", "futures-util", - "glib 0.15.11", + "glib 0.16.7", "gstreamer-sys", "libc", "muldiv", @@ -663,28 +675,45 @@ dependencies = [ ] [[package]] -name = "gstreamer-audio-sys" -version = "0.18.3" +name = "gstreamer-audio" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34258fb53c558c0f41dad194037cbeaabf49d347570df11b8bd1c4897cf7d7c" +checksum = "b6c77f86675dd2ea500bcbe17c11a146354df354a24dc222cbda793707e75833" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "bitflags", + "cfg-if", + "glib 0.16.7", + "gstreamer", + "gstreamer-audio-sys", + "gstreamer-base", + "libc", + "once_cell", +] + +[[package]] +name = "gstreamer-audio-sys" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b328f1bd487ef22e5ec6c03113515a2b1be10ea9bc12ecab646966d1b48361d5" +dependencies = [ + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gstreamer-base" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224f35f36582407caf58ded74854526beeecc23d0cf64b8d1c3e00584ed6863f" +checksum = "a61a299f9ea2ca892b43e2e428b86c679875e95ba23f8ae06fd730308df630f0" dependencies = [ + "atomic_refcell", "bitflags", "cfg-if", - "glib 0.15.11", + "glib 0.16.7", "gstreamer", "gstreamer-base-sys", "libc", @@ -692,54 +721,56 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.18.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a083493c3c340e71fa7c66eebda016e9fafc03eb1b4804cf9b2bad61994b078e" +checksum = "dbc3c4476e1503ae245c89fbe20060c30ec6ade5f44620bcc402cbc70a3911a1" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gstreamer-pbutils" -version = "0.18.7" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330684c49f79775d7acce8bef5a7a7475f02374c9c6cead39ced3ad423fc8ea9" +checksum = "0355d5896223bc988655bb61ad9ed18c9d6dbd26eefd82d5240de2b2579cab4a" dependencies = [ "bitflags", - "glib 0.15.11", + "glib 0.16.7", "gstreamer", + "gstreamer-audio", "gstreamer-pbutils-sys", + "gstreamer-video", "libc", "thiserror", ] [[package]] name = "gstreamer-pbutils-sys" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f79839066fbcc6d1a8690b2f85d5cc5cdc0984f36d4054f5cc67a7ad3ab72d" +checksum = "8c816eccb95427cbf15df5fe30e168979894bba277d96944adcc2e4ff1154e4a" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-audio-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gstreamer-player" -version = "0.18.0" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f14ee02352ba73cadebe640bfb33f12fe8d03cbcad816a102d55a0251fb99bb" +checksum = "9d058cf1a5db88fdfdc370a3e7c88335cba2f238578a794e1f8e58d8f903835d" dependencies = [ "bitflags", - "glib 0.15.11", + "glib 0.16.7", "gstreamer", "gstreamer-player-sys", "gstreamer-video", @@ -749,40 +780,40 @@ dependencies = [ [[package]] name = "gstreamer-player-sys" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9b674b39a4d0e18710f6e3d2b109f1793d8028ee4e39da3909b55b4529d399" +checksum = "4725bb801f8c7976f93d3846eca66c8ababf263bafcca3c43a7b17f9f01fae19" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gstreamer-sys" -version = "0.18.0" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3517a65d3c2e6f8905b456eba5d53bda158d664863aef960b44f651cb7d33e2" +checksum = "545f52ad8a480732cc4290fd65dfe42952c8ae374fe581831ba15981fedf18a4" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "gstreamer-video" -version = "0.18.7" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9418adfc72dafa1ad9eb106527ce4804887d101027c4528ec28c7d29cc899519" +checksum = "5e99623fb99436c4b2da66ae94b25881c94db5144afc1bd7c84cee5cabb72f18" dependencies = [ "bitflags", "cfg-if", "futures-channel", - "glib 0.15.11", + "glib 0.16.7", "gstreamer", "gstreamer-base", "gstreamer-video-sys", @@ -792,16 +823,16 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.18.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33331b1675e73b5b000c796354278eca7fdde9327015971d9f41afe28b96e0dc" +checksum = "9206e9df0ed84824bfe4cc13e3359154ad7624221c7d3d6242585db3f19a15d9" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] @@ -812,8 +843,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" [[package]] name = "gtk4" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8954da3659ff1cb35aa95110021b33fadcd8e306e8fe41f32146ffa009665a79" dependencies = [ "bitflags", "cairo-rs", @@ -821,8 +853,8 @@ dependencies = [ "futures-channel", "gdk-pixbuf", "gdk4", - "gio 0.16.0", - "glib 0.16.0", + "gio", + "glib 0.16.7", "graphene-rs", "gsk4", "gtk4-macros", @@ -834,43 +866,35 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58138cd3c595e04f82df050390aa7d2bd093795ce569e5f1d49eb496ef67fe7b" dependencies = [ "anyhow", - "proc-macro-crate 1.1.3", + "proc-macro-crate", "proc-macro-error", "proc-macro2", - "quick-xml", "quote", "syn", ] [[package]] name = "gtk4-sys" -version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#bebb1050b58ff9a4284b6358a1bef2ba614fbfa3" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef29e09e055b2f2550eb1882caa6961a1ae3c971a70bcb25cb9d5ab6cbd63821" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "graphene-sys", "gsk4-sys", "libc", "pango-sys", - "system-deps 6.0.2", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", + "system-deps", ] [[package]] @@ -880,12 +904,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] -name = "itertools" -version = "0.9.0" +name = "iana-time-zone" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ - "either", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", ] [[package]] @@ -896,14 +944,16 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.2.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#f77307028c4d874d9cb87e9489e389aad4151dbf" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48" dependencies = [ + "bitflags", "futures-channel", "gdk-pixbuf", "gdk4", - "gio 0.16.0", - "glib 0.16.0", + "gio", + "glib 0.16.7", "gtk4", "libadwaita-sys", "libc", @@ -913,23 +963,25 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.2.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs.git#f77307028c4d874d9cb87e9489e389aad4151dbf" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b" dependencies = [ "gdk4-sys", - "gio-sys 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gtk4-sys", "libc", - "system-deps 6.0.2", + "pango-sys", + "system-deps", ] [[package]] name = "libc" -version = "0.2.125" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libdbus-sys" @@ -950,6 +1002,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + [[package]] name = "locale_config" version = "0.3.0" @@ -965,9 +1026,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] @@ -1019,19 +1080,19 @@ dependencies = [ [[package]] name = "mpris-player" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6badd6ebe31be46eb2e2975cf3b34b183bace5f8a8db1d609fefc4d46fbb07" +checksum = "be832ec9171fdaf43609d02bb552f4129ba6eacd184bb25186e2906dbd3cf098" dependencies = [ "dbus", - "glib 0.10.3", + "glib 0.15.12", ] [[package]] name = "muldiv" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "musicus" @@ -1040,8 +1101,8 @@ dependencies = [ "anyhow", "futures-channel", "gettext-rs", - "gio 0.16.0", - "glib 0.16.0", + "gio", + "glib 0.16.7", "gstreamer", "gtk-macros", "gtk4", @@ -1058,8 +1119,8 @@ name = "musicus_backend" version = "0.1.0" dependencies = [ "fragile", - "gio 0.15.11", - "glib 0.15.11", + "gio", + "glib 0.16.7", "gstreamer", "gstreamer-player", "log", @@ -1088,7 +1149,7 @@ name = "musicus_import" version = "0.1.0" dependencies = [ "base64", - "glib 0.15.11", + "glib 0.16.7", "gstreamer", "gstreamer-pbutils", "log", @@ -1111,9 +1172,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", "num-integer", @@ -1122,9 +1183,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] @@ -1160,26 +1221,28 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.10.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "option-operations" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d6113415f41b268f1195907427519769e40ee6f28cbb053795098a2c16f447" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" dependencies = [ "paste", ] [[package]] name = "pango" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" dependencies = [ "bitflags", - "glib 0.16.0", + "gio", + "glib 0.16.7", "libc", "once_cell", "pango-sys", @@ -1187,27 +1250,29 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#623cce140affdf2f2e73139db331c7e62f91dced" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "system-deps 6.0.2", + "system-deps", ] [[package]] name = "paste" -version = "1.0.7" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pest" -version = "2.1.3" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" dependencies = [ + "thiserror", "ucd-trie", ] @@ -1225,15 +1290,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -1243,19 +1308,11 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - -[[package]] -name = "proc-macro-crate" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" dependencies = [ + "once_cell", "thiserror", "toml", ] @@ -1286,27 +1343,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quick-xml" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" -dependencies = [ - "memchr", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -1334,18 +1382,18 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -1354,9 +1402,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rustc_version" @@ -1369,14 +1417,20 @@ dependencies = [ [[package]] name = "sanitize-filename" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf18934a12018228c5b55a6dae9df5d0641e3566b3630cb46cc55564068e7c2f" +checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c" dependencies = [ "lazy_static", "regex", ] +[[package]] +name = "scratch" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" + [[package]] name = "semver" version = "0.11.0" @@ -1397,15 +1451,15 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", @@ -1414,71 +1468,41 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "strum" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" - -[[package]] -name = "strum_macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn", -] +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "syn" -version = "1.0.92" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "system-deps" -version = "1.3.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" -dependencies = [ - "heck 0.3.3", - "pkg-config", - "strum", - "strum_macros", - "thiserror", - "toml", - "version-compare 0.0.10", -] - -[[package]] -name = "system-deps" -version = "6.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" dependencies = [ "cfg-expr", - "heck 0.4.0", + "heck", "pkg-config", "toml", - "version-compare 0.1.0", + "version-compare", ] [[package]] @@ -1488,19 +1512,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] -name = "thiserror" -version = "1.0.31" +name = "termcolor" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1509,62 +1542,64 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] name = "tokio" -version = "1.18.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f48b6d60512a392e34dbf7fd456249fd2de3c83669ab642e021903f4015185b" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ + "autocfg", "pin-project-lite", + "windows-sys", ] [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] -name = "unicode-segmentation" -version = "1.9.0" +name = "unicode-ident" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-width" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uuid" -version = "1.0.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ "getrandom", ] @@ -1577,15 +1612,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.0.10" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - -[[package]] -name = "version-compare" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -1599,6 +1628,66 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + [[package]] name = "winapi" version = "0.3.9" @@ -1615,8 +1704,74 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" diff --git a/crates/backend/Cargo.toml b/crates/backend/Cargo.toml index f7d7950..5e6b453 100644 --- a/crates/backend/Cargo.toml +++ b/crates/backend/Cargo.toml @@ -4,16 +4,16 @@ version = "0.1.0" edition = "2021" [dependencies] -fragile = "1.2.0" -gio = "0.15.11" -glib = "0.15.11" -gstreamer = "0.18.8" -gstreamer-player = "0.18.0" -log = { version = "0.4.16", features = ["std"] } +fragile = "2" +gio = "0.16" +glib = "0.16" +gstreamer = "0.19" +gstreamer-player = "0.19" +log = { version = "0.4", features = ["std"] } musicus_database = { version = "0.1.0", path = "../database" } musicus_import = { version = "0.1.0", path = "../import" } -thiserror = "1.0.31" -tokio = { version = "1.18.0", features = ["sync"] } +thiserror = "1" +tokio = { version = "1", features = ["sync"] } [target.'cfg(target_os = "linux")'.dependencies] -mpris-player = "0.6.1" +mpris-player = "0.6" diff --git a/crates/backend/src/player.rs b/crates/backend/src/player.rs index 64a0329..a05ee0d 100644 --- a/crates/backend/src/player.rs +++ b/crates/backend/src/player.rs @@ -1,6 +1,5 @@ use crate::{Backend, Error, Result}; use glib::clone; -use gstreamer_player::prelude::*; use musicus_database::Track; use std::cell::{Cell, RefCell}; use std::path::PathBuf; @@ -32,7 +31,10 @@ pub struct Player { 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 player = gstreamer_player::Player::new( + gstreamer_player::PlayerVideoRenderer::NONE, + Some(&dispatcher), + ); let mut config = player.config(); config.set_position_update_interval(250); player.set_config(config).unwrap(); @@ -196,7 +198,7 @@ impl Player { /// Add some items to the playlist. pub fn add_items(&self, mut items: Vec) -> Result<()> { if items.is_empty() { - return Ok(()) + return Ok(()); } let was_empty = { diff --git a/crates/database/Cargo.toml b/crates/database/Cargo.toml index 63bff71..e2538ea 100644 --- a/crates/database/Cargo.toml +++ b/crates/database/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition = "2021" [dependencies] -diesel = { version = "1.4.8", features = ["sqlite"] } -diesel_migrations = "1.4.0" -chrono = "0.4.19" -log = "0.4.16" -rand = "0.8.5" -thiserror = "1.0.31" -uuid = { version = "1.0.0", features = ["v4"] } +diesel = { version = "1", features = ["sqlite"] } +diesel_migrations = "1" +chrono = "0.4" +log = "0.4" +rand = "0.8" +thiserror = "1" +uuid = { version = "1", features = ["v4"] } diff --git a/crates/database/src/medium.rs b/crates/database/src/medium.rs index 41bc048..4f1a799 100644 --- a/crates/database/src/medium.rs +++ b/crates/database/src/medium.rs @@ -60,7 +60,12 @@ pub struct Track { } impl Track { - pub fn new(recording: Recording, work_parts: Vec, source_index: usize, path: String) -> Self { + pub fn new( + recording: Recording, + work_parts: Vec, + source_index: usize, + path: String, + ) -> Self { Self { recording, work_parts, @@ -295,8 +300,8 @@ impl Database { name: row.name, discid: row.discid, tracks, - last_used: row.last_used.map(|t| Utc.timestamp(t, 0)), - last_played: row.last_played.map(|t| Utc.timestamp(t, 0)), + last_used: row.last_used.map(|t| Utc.timestamp_opt(t, 0).unwrap()), + last_played: row.last_played.map(|t| Utc.timestamp_opt(t, 0).unwrap()), }; Ok(medium) @@ -328,8 +333,8 @@ impl Database { work_parts: part_indices, source_index: row.source_index as usize, path: row.path, - last_used: row.last_used.map(|t| Utc.timestamp(t, 0)), - last_played: row.last_played.map(|t| Utc.timestamp(t, 0)), + last_used: row.last_used.map(|t| Utc.timestamp_opt(t, 0).unwrap()), + last_played: row.last_played.map(|t| Utc.timestamp_opt(t, 0).unwrap()), }; Ok(track) diff --git a/crates/database/src/recordings.rs b/crates/database/src/recordings.rs index acfde3d..84a918e 100644 --- a/crates/database/src/recordings.rs +++ b/crates/database/src/recordings.rs @@ -275,8 +275,8 @@ impl Database { work, comment: row.comment, performances: performance_descriptions, - last_used: row.last_used.map(|t| Utc.timestamp(t, 0)), - last_played: row.last_played.map(|t| Utc.timestamp(t, 0)), + last_used: row.last_used.map(|t| Utc.timestamp_opt(t, 0).unwrap()), + last_played: row.last_played.map(|t| Utc.timestamp_opt(t, 0).unwrap()), }; Ok(recording_description) diff --git a/crates/database/src/works.rs b/crates/database/src/works.rs index 51f8077..140b266 100644 --- a/crates/database/src/works.rs +++ b/crates/database/src/works.rs @@ -67,7 +67,13 @@ pub struct Work { } impl Work { - pub fn new(id: String, title: String, composer: Person, instruments: Vec, parts: Vec) -> Self { + pub fn new( + id: String, + title: String, + composer: Person, + instruments: Vec, + parts: Vec, + ) -> Self { Self { id, title, @@ -219,8 +225,8 @@ impl Database { title: row.title, instruments, parts, - last_used: row.last_used.map(|t| Utc.timestamp(t, 0)), - last_played: row.last_played.map(|t| Utc.timestamp(t, 0)), + last_used: row.last_used.map(|t| Utc.timestamp_opt(t, 0).unwrap()), + last_played: row.last_played.map(|t| Utc.timestamp_opt(t, 0).unwrap()), }) } diff --git a/crates/import/Cargo.toml b/crates/import/Cargo.toml index 45a5c2e..8011656 100644 --- a/crates/import/Cargo.toml +++ b/crates/import/Cargo.toml @@ -4,13 +4,13 @@ version = "0.1.0" edition = "2021" [dependencies] -base64 = "0.13.0" -glib = "0.15.11" -gstreamer = "0.18.8" -gstreamer-pbutils = "0.18.7" -log = "0.4.16" -once_cell = "1.10.0" -rand = "0.8.5" -thiserror = "1.0.31" -sha2 = "0.10.2" -tokio = { version = "1.18.0", features = ["sync"] } +base64 = "0.13" +glib = "0.16" +gstreamer = "0.19" +gstreamer-pbutils = "0.19" +log = "0.4" +once_cell = "1" +rand = "0.8" +thiserror = "1" +sha2 = "0.10" +tokio = { version = "1", features = ["sync"] } diff --git a/crates/import/src/disc.rs b/crates/import/src/disc.rs index 2cb815d..48960cc 100644 --- a/crates/import/src/disc.rs +++ b/crates/import/src/disc.rs @@ -18,11 +18,11 @@ pub(super) fn new() -> Result { // Build the GStreamer pipeline. It will contain a fakesink initially to be able to run it // forward to the paused state without specifying a file name before knowing the tracks. - let cdparanoiasrc = ElementFactory::make("cdparanoiasrc", None)?; - let queue = ElementFactory::make("queue", None)?; - let audioconvert = ElementFactory::make("audioconvert", None)?; - let flacenc = ElementFactory::make("flacenc", None)?; - let fakesink = gstreamer::ElementFactory::make("fakesink", None)?; + let cdparanoiasrc = ElementFactory::make("cdparanoiasrc").build()?; + let queue = ElementFactory::make("queue").build()?; + let audioconvert = ElementFactory::make("audioconvert").build()?; + let flacenc = ElementFactory::make("flacenc").build()?; + let fakesink = gstreamer::ElementFactory::make("fakesink").build()?; let pipeline = gstreamer::Pipeline::new(None); pipeline.add_many(&[&cdparanoiasrc, &queue, &audioconvert, &flacenc, &fakesink])?; @@ -64,7 +64,7 @@ pub(super) fn new() -> Result { fakesink.set_state(gstreamer::State::Null)?; pipeline.remove(&fakesink)?; - let filesink = gstreamer::ElementFactory::make("filesink", None)?; + let filesink = gstreamer::ElementFactory::make("filesink").build()?; pipeline.add(&filesink)?; gstreamer::Element::link(&flacenc, &filesink)?; diff --git a/crates/musicus/Cargo.toml b/crates/musicus/Cargo.toml index 7764ac0..704402c 100644 --- a/crates/musicus/Cargo.toml +++ b/crates/musicus/Cargo.toml @@ -4,17 +4,17 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0.57" -adw = { git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git", package = "libadwaita", features = ["v1_2"] } -futures-channel = "0.3.21" -gettext-rs = { version = "0.7.0", features = ["gettext-system"] } -gio = {git = "https://github.com/gtk-rs/gtk-rs-core"} -glib = {git = "https://github.com/gtk-rs/gtk-rs-core"} -gstreamer = "0.18.8" -gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gtk4" } -gtk-macros = "0.3.0" -log = "0.4.16" +anyhow = "1" +adw = { package = "libadwaita", version = "0.2", features = ["v1_2"] } +futures-channel = "0.3" +gettext-rs = { version = "0.7", features = ["gettext-system"] } +gio = "0.16" +glib = "0.16" +gstreamer = "0.19" +gtk = { package = "gtk4", version = "0.5" } +gtk-macros = "0.3" +log = "0.4" musicus_backend = { version = "0.1.0", path = "../backend" } -once_cell = "1.10.0" -rand = "0.8.5" -sanitize-filename = "0.3.0" +once_cell = "1" +rand = "0.8" +sanitize-filename = "0.4" diff --git a/crates/musicus/src/import/medium_preview.rs b/crates/musicus/src/import/medium_preview.rs index 2ede869..c39d3e5 100644 --- a/crates/musicus/src/import/medium_preview.rs +++ b/crates/musicus/src/import/medium_preview.rs @@ -5,7 +5,7 @@ use adw::builders::ActionRowBuilder; use anyhow::{anyhow, Result}; use gettextrs::gettext; use glib::clone; -use gtk::builders::{ListBoxBuilder, FrameBuilder}; +use gtk::builders::{FrameBuilder, ListBoxBuilder}; use gtk::prelude::*; use gtk_macros::get_widget; use musicus_backend::db::Medium; diff --git a/crates/musicus/src/main.rs b/crates/musicus/src/main.rs index 78a37cb..4cdcaa5 100644 --- a/crates/musicus/src/main.rs +++ b/crates/musicus/src/main.rs @@ -26,8 +26,7 @@ fn main() { gettextrs::textdomain("musicus").unwrap(); gstreamer::init().expect("Failed to initialize GStreamer!"); - gtk::init().expect("Failed to initialize GTK!"); - adw::init(); + adw::init().expect("Failed to initialize libadwaita!"); resources::init().expect("Failed to initialize resources!"); let app = gtk::Application::new(Some("de.johrpan.musicus"), gio::ApplicationFlags::empty()); diff --git a/crates/musicus/src/widgets/button_row.rs b/crates/musicus/src/widgets/button_row.rs index a33c04c..19a8603 100644 --- a/crates/musicus/src/widgets/button_row.rs +++ b/crates/musicus/src/widgets/button_row.rs @@ -1,5 +1,5 @@ use super::Widget; -use adw::{prelude::*, builders::ActionRowBuilder}; +use adw::{builders::ActionRowBuilder, prelude::*}; use gtk::builders::ButtonBuilder; /// A list box row with a single button. diff --git a/crates/musicus/src/widgets/indexed_list_model.rs b/crates/musicus/src/widgets/indexed_list_model.rs index b49ae77..3f52a93 100644 --- a/crates/musicus/src/widgets/indexed_list_model.rs +++ b/crates/musicus/src/widgets/indexed_list_model.rs @@ -20,7 +20,7 @@ impl IndexedListModel { impl Default for IndexedListModel { fn default() -> Self { - glib::Object::new(&[]).unwrap() + glib::Object::new(&[]) } } @@ -57,13 +57,7 @@ mod indexed_list_model_imp { PROPERTIES.as_ref() } - fn set_property( - &self, - _: &Self::Type, - _: usize, - value: &glib::Value, - pspec: &glib::ParamSpec, - ) { + fn set_property(&self, _: usize, value: &glib::Value, pspec: &glib::ParamSpec) { match pspec.name() { "length" => { let length = value.get::().unwrap(); @@ -73,7 +67,7 @@ mod indexed_list_model_imp { } } - fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "length" => self.length.get().to_value(), _ => unimplemented!(), @@ -82,15 +76,15 @@ mod indexed_list_model_imp { } impl ListModelImpl for IndexedListModel { - fn item_type(&self, _: &Self::Type) -> glib::Type { + fn item_type(&self) -> glib::Type { ItemIndex::static_type() } - fn n_items(&self, _: &Self::Type) -> u32 { + fn n_items(&self) -> u32 { self.length.get() } - fn item(&self, _: &Self::Type, position: u32) -> Option { + fn item(&self, position: u32) -> Option { Some(ItemIndex::new(position).upcast()) } } @@ -104,7 +98,7 @@ glib::wrapper! { impl ItemIndex { /// Create a new item index. pub fn new(value: u32) -> Self { - glib::Object::new(&[("value", &value)]).unwrap() + glib::Object::new(&[("value", &value)]) } /// Get the value of the item index.. @@ -146,13 +140,7 @@ mod item_index_imp { PROPERTIES.as_ref() } - fn set_property( - &self, - _: &Self::Type, - _: usize, - value: &glib::Value, - pspec: &glib::ParamSpec, - ) { + fn set_property(&self, _: usize, value: &glib::Value, pspec: &glib::ParamSpec) { match pspec.name() { "value" => { let value = value.get::().unwrap(); @@ -162,7 +150,7 @@ mod item_index_imp { } } - fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "value" => self.value.get().to_value(), _ => unimplemented!(), diff --git a/crates/musicus/src/widgets/section.rs b/crates/musicus/src/widgets/section.rs index 8f30ed1..fe4da37 100644 --- a/crates/musicus/src/widgets/section.rs +++ b/crates/musicus/src/widgets/section.rs @@ -1,5 +1,5 @@ use super::Widget; -use gtk::{prelude::*, builders::ButtonBuilder}; +use gtk::{builders::ButtonBuilder, prelude::*}; use gtk_macros::get_widget; /// A widget displaying a title, a framed child widget and, if needed, some