From b348339b4e48abf8af214bcb2a10021e8497bd2e Mon Sep 17 00:00:00 2001 From: "Tom A. Wagner" Date: Fri, 12 Mar 2021 18:04:08 +0100 Subject: [PATCH] Update dependencies, use pipewire-rs crates from crates.io --- Cargo.lock | 212 +++++++++++++++++++------------------ Cargo.toml | 5 +- src/pipewire_connection.rs | 2 +- src/pipewire_state.rs | 5 +- 4 files changed, 116 insertions(+), 108 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e0efd7e..d7f2d10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,9 +43,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "bindgen" -version = "0.56.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" +checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" dependencies = [ "bitflags", "cexpr", @@ -73,7 +73,7 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "cairo-rs" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "bitflags", "cairo-sys-rs", @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "glib-sys", "libc", @@ -95,9 +95,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.66" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" [[package]] name = "cexpr" @@ -122,9 +122,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c" +checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1" dependencies = [ "glob", "libc", @@ -163,9 +163,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26ecb66b4bdca6c1409b40fb255eefc2bd4f6d135dab3c3124f80ffa2a9661e" +checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", @@ -176,9 +176,9 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c40e7a744c1d22cd64783732a287dd5d08a9f0e1d89b685bf084aab753cb20d4" +checksum = "cf539fba70056b50f40a22e0da30639518a12ee18c35807858a63b158cb6dde7" dependencies = [ "memoffset", "rustc_version", @@ -207,24 +207,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846" +checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65" +checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" [[package]] name = "futures-executor" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9" +checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1" dependencies = [ "futures-core", "futures-task", @@ -233,24 +233,21 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500" +checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" [[package]] name = "futures-task" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86" -dependencies = [ - "once_cell", -] +checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80" [[package]] name = "futures-util" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b" +checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1" dependencies = [ "futures-core", "futures-task", @@ -262,7 +259,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -273,7 +270,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "gio-sys", "glib-sys", @@ -285,7 +282,7 @@ dependencies = [ [[package]] name = "gdk4" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "bitflags", "cairo-rs", @@ -300,7 +297,7 @@ dependencies = [ [[package]] name = "gdk4-sys" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -315,7 +312,7 @@ dependencies = [ [[package]] name = "gio" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "bitflags", "futures-channel", @@ -331,7 +328,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "glib-sys", "gobject-sys", @@ -343,7 +340,7 @@ dependencies = [ [[package]] name = "glib" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "bitflags", "futures-channel", @@ -361,11 +358,10 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "anyhow", "heck", - "itertools 0.10.0", "proc-macro-crate", "proc-macro-error", "proc-macro2", @@ -376,7 +372,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "libc", "system-deps", @@ -391,7 +387,7 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "gobject-sys" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "glib-sys", "libc", @@ -401,7 +397,7 @@ dependencies = [ [[package]] name = "graphene-rs" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "glib", "graphene-sys", @@ -411,7 +407,7 @@ dependencies = [ [[package]] name = "graphene-sys" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "glib-sys", "libc", @@ -422,7 +418,7 @@ dependencies = [ [[package]] name = "gsk4" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "bitflags", "cairo-rs", @@ -437,7 +433,7 @@ dependencies = [ [[package]] name = "gsk4-sys" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -452,7 +448,7 @@ dependencies = [ [[package]] name = "gtk4" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "bitflags", "cairo-rs", @@ -474,7 +470,7 @@ dependencies = [ [[package]] name = "gtk4-macros" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "anyhow", "heck", @@ -489,7 +485,7 @@ dependencies = [ [[package]] name = "gtk4-sys" version = "0.1.0" -source = "git+https://github.com/gtk-rs/gtk4-rs/#0f06879b6c4fb1870112d613e5837e8befea0d02" +source = "git+https://github.com/gtk-rs/gtk4-rs/#23e1862d1e9d74050cf13d5a563b8397d58e1164" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -571,15 +567,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.82" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" +checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" [[package]] name = "libloading" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" dependencies = [ "cfg-if 1.0.0", "winapi", @@ -587,8 +583,9 @@ dependencies = [ [[package]] name = "libspa" -version = "0.1.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#ac6644e069da3f288acfa240795fd409eaa698af" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2d37fac3462c1ed6e836bcaa347db6d5bb3e62e410988f270121a24d9f9622" dependencies = [ "bitflags", "libspa-sys", @@ -596,8 +593,9 @@ dependencies = [ [[package]] name = "libspa-sys" -version = "0.1.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#ac6644e069da3f288acfa240795fd409eaa698af" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "607f768296c29f09a51bab3f1a31414fe0abba295edafaa30853e87e794a773b" dependencies = [ "bindgen", "system-deps", @@ -605,11 +603,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -620,9 +618,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "memoffset" -version = "0.5.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" dependencies = [ "autocfg", ] @@ -652,14 +650,14 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.5.2" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "pango" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "bitflags", "glib", @@ -671,7 +669,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.13.0" -source = "git+https://github.com/gtk-rs/gtk-rs#2418edfb1dd4e511485a47ef7307620f5790ea96" +source = "git+https://github.com/gtk-rs/gtk-rs#295e8c16d54f1b151592db41a7c3139fe762f9e7" dependencies = [ "glib-sys", "gobject-sys", @@ -686,10 +684,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "pin-project-lite" -version = "0.2.4" +name = "pest" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" [[package]] name = "pin-utils" @@ -699,8 +706,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pipewire" -version = "0.1.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#ac6644e069da3f288acfa240795fd409eaa698af" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0227f5f22225f4df19b6e6890b63b36d53918f267941da2332c419312a3efdd8" dependencies = [ "anyhow", "bitflags", @@ -714,8 +722,9 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.1.0" -source = "git+https://gitlab.freedesktop.org/pipewire/pipewire-rs#ac6644e069da3f288acfa240795fd409eaa698af" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9237480e2c4a5f316116d6e5c8a7de3cc187145a83836278a0c936c60f30d228" dependencies = [ "bindgen", "libspa-sys", @@ -772,30 +781,29 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.4.3" +version = "1.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" +checksum = "54fd1046a3107eb58f42de31d656fee6853e5d276c455fd943742dce89fc3dd3" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" +checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" [[package]] name = "rustc-hash" @@ -805,33 +813,36 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.2.3" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ "semver", ] [[package]] name = "semver" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ "semver-parser", ] [[package]] name = "semver-parser" -version = "0.7.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] [[package]] name = "serde" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b2349061381baf54a58e4b13c89369feb0ef2eaa57198899e2312aac30aab" +checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f" [[package]] name = "shlex" @@ -887,9 +898,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" +checksum = "8fd9bc7ccc2688b3344c2f48b9b546648b25ce0b20fc717ee7fa7981a8ca9717" dependencies = [ "proc-macro2", "quote", @@ -898,11 +909,13 @@ dependencies = [ [[package]] name = "system-deps" -version = "2.0.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b59b8aafd652f3c1469f16e6c223121e8a8dbe40c71475209c1401cff3a67ef" +checksum = "14bd4dc3cd87e19c51f550d1b421c628074b3cf4c6daebc7ccbc8a03b237c751" dependencies = [ + "anyhow", "heck", + "itertools 0.10.0", "pkg-config", "strum", "strum_macros", @@ -931,33 +944,24 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "thread_local" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" -dependencies = [ - "lazy_static", -] - [[package]] name = "toml" version = "0.5.8" @@ -967,6 +971,12 @@ dependencies = [ "serde", ] +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + [[package]] name = "unicode-segmentation" version = "1.7.1" diff --git a/Cargo.toml b/Cargo.toml index 30d4b82..f2db71d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,10 @@ categories = ["gui", "multimedia"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -libspa = { git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs" } -pipewire = { git = "https://gitlab.freedesktop.org/pipewire/pipewire-rs" } gtk = { git = "https://github.com/gtk-rs/gtk4-rs/", package = "gtk4" } +pipewire = "0.2.2" +libspa = "0.2.2" + log = "0.4.11" env_logger = "0.8.2" diff --git a/src/pipewire_connection.rs b/src/pipewire_connection.rs index c6fc1f3..2e3da82 100644 --- a/src/pipewire_connection.rs +++ b/src/pipewire_connection.rs @@ -30,7 +30,7 @@ impl PipewireConnection { pw::Context::new(&mainloop).map_err(|_| "Failed to create pipewire context")?; let core = Rc::new( context - .connect() + .connect(None) .map_err(|_| "Failed to connect to pipewire core")?, ); let registry = core.get_registry(); diff --git a/src/pipewire_state.rs b/src/pipewire_state.rs index 6a5840c..2a610bc 100644 --- a/src/pipewire_state.rs +++ b/src/pipewire_state.rs @@ -3,10 +3,7 @@ use crate::{view, PipewireLink}; use gtk::WidgetExt; use libspa::dict::ReadableDict; use log::warn; -use pipewire::{ - port::Direction, - registry::{GlobalObject, ObjectType}, -}; +use pipewire::{port::Direction, registry::GlobalObject, types::ObjectType}; use std::{cell::RefCell, collections::HashMap, rc::Rc};