Cargo.lock

@@ -25,28 +25,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "alsa"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c4da790adcb2ce5e758c064b4f3ec17a30349f9961d3e5e6c9688b052a9e18"
-dependencies = [
- "alsa-sys",
- "bitflags",
- "libc",
- "nix 0.20.0",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "andrew"
 version = "0.3.1"
@@ -119,25 +97,6 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
 
-[[package]]
-name = "bindgen"
-version = "0.56.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
-dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.5.2"
@@ -189,12 +148,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
-[[package]]
-name = "bytes"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"
-
 [[package]]
 name = "calloop"
 version = "0.6.5"
@@ -214,21 +167,6 @@ dependencies = [
  "jobserver",
 ]
 
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cexpr"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
-dependencies = [
- "nom 5.1.2",
-]
-
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@@ -247,17 +185,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
-[[package]]
-name = "clang-sys"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.7.0",
-]
-
 [[package]]
 name = "clap"
 version = "2.33.3"
@@ -273,12 +200,6 @@ dependencies = [
  "vec_map",
 ]
 
-[[package]]
-name = "claxon"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
-
 [[package]]
 name = "cocoa"
 version = "0.24.0"
@@ -310,16 +231,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "combine"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2d47c1b11006b87e492b53b313bb699ce60e16613c4dddaa91f8f7c220ab2fa"
-dependencies = [
- "bytes",
- "memchr",
-]
-
 [[package]]
 name = "copyless"
 version = "0.1.5"
@@ -424,70 +335,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "coreaudio-rs"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88"
-dependencies = [
- "bitflags",
- "coreaudio-sys",
-]
-
-[[package]]
-name = "coreaudio-sys"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa"
-dependencies = [
- "bindgen",
-]
-
-[[package]]
-name = "cpal"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8351ddf2aaa3c583fa388029f8b3d26f3c7035a20911fdd5f2e2ed7ab57dad25"
-dependencies = [
- "alsa",
- "core-foundation-sys 0.6.2",
- "coreaudio-rs",
- "jni",
- "js-sys",
- "lazy_static",
- "libc",
- "mach 0.3.2",
- "ndk 0.3.0",
- "ndk-glue 0.3.0",
- "nix 0.20.0",
- "oboe",
- "parking_lot",
- "stdweb 0.1.3",
- "thiserror",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-dependencies = [
- "cfg-if 1.0.0",
- "lazy_static",
-]
-
 [[package]]
 name = "d3d12"
 version = "0.3.2"
@@ -695,13 +542,11 @@ dependencies = [
  "anyhow",
  "bitfield",
  "clap",
- "crossbeam-channel",
  "egui",
  "egui_wgpu_backend",
  "egui_winit_platform",
  "gilrs",
  "pixels",
- "rodio",
  "winit",
  "winit_input_helper",
 ]
@@ -890,18 +735,12 @@ dependencies = [
  "log",
  "nix 0.20.0",
  "rusty-xinput",
- "stdweb 0.4.20",
+ "stdweb",
  "uuid",
  "vec_map",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
 [[package]]
 name = "glow"
 version = "0.7.2"
@@ -942,7 +781,7 @@ checksum = "e8a70f1e87a3840ed6a3e99e02c2b861e4dbdf26f0d07e38f42ea5aff46cfce2"
 dependencies = [
  "bitflags",
  "gpu-descriptor-types",
- "hashbrown 0.9.1",
+ "hashbrown",
  "tracing",
 ]
 
@@ -964,27 +803,15 @@ dependencies = [
  "ahash 0.4.7",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hound"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -993,12 +820,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "indexmap"
-version = "1.7.0"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5"
+checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3"
 dependencies = [
  "autocfg",
- "hashbrown 0.11.2",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1023,7 +850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
 dependencies = [
  "core-foundation-sys 0.6.2",
- "mach 0.2.3",
+ "mach",
 ]
 
 [[package]]
@@ -1041,20 +868,6 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
 
-[[package]]
-name = "jni"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24967112a1e4301ca5342ea339763613a37592b8a6ce6cf2e4494537c7a42faf"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
 [[package]]
 name = "jni-sys"
 version = "0.3.0"
@@ -1111,22 +924,11 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
 [[package]]
 name = "libc"
-version = "0.2.98"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
 
 [[package]]
 name = "libloading"
@@ -1185,15 +987,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mach"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@@ -1238,26 +1031,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "minimp3"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372"
-dependencies = [
- "minimp3-sys",
- "slice-deque",
- "thiserror",
-]
-
-[[package]]
-name = "minimp3-sys"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "mio"
 version = "0.6.23"
@@ -1325,19 +1098,7 @@ checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73"
 dependencies = [
  "jni-sys",
  "ndk-sys",
- "num_enum 0.4.3",
+ "num_enum",
- "thiserror",
-]
-
-[[package]]
-name = "ndk"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
-dependencies = [
- "jni-sys",
- "ndk-sys",
- "num_enum 0.5.1",
  "thiserror",
 ]
 
@@ -1350,21 +1111,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "ndk 0.2.1",
+ "ndk",
- "ndk-macro",
- "ndk-sys",
-]
-
-[[package]]
-name = "ndk-glue"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "ndk 0.3.0",
  "ndk-macro",
  "ndk-sys",
 ]
@@ -1425,35 +1172,14 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "5.1.2"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
+checksum = "046a595c7251e2f48b291c1b65d98ef1df51dbfbad46e99a1ff09729535a779e"
 dependencies = [
  "memchr",
  "version_check",
 ]
 
-[[package]]
-name = "nom"
-version = "6.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
-dependencies = [
- "memchr",
- "version_check",
-]
-
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.14"
@@ -1470,17 +1196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4"
 dependencies = [
  "derivative",
- "num_enum_derive 0.4.3",
+ "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b45a5c2ac4dd696ed30fa6b94b057ad909c7b7fc2e0d0808192bced894066"
-dependencies = [
- "derivative",
- "num_enum_derive 0.5.1",
 ]
 
 [[package]]
@@ -1495,18 +1211,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -1526,38 +1230,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "oboe"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfa187b38ae20374617b7ad418034ed3dc90ac980181d211518bd03537ae8f8d"
-dependencies = [
- "jni",
- "ndk 0.3.0",
- "ndk-glue 0.3.0",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b88e64835aa3f579c08d182526dc34e3907343d5b97e87b71a40ba5bca7aca9e"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.8.0"
@@ -1598,12 +1270,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
@@ -1622,9 +1288,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
 
 [[package]]
 name = "pixels"
@@ -1702,40 +1368,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "regex"
-version = "1.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
-
-[[package]]
-name = "rodio"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d98f5e557b61525057e2bc142c8cd7f0e70d75dc32852309bec440e6e046bf9"
-dependencies = [
- "claxon",
- "cpal",
- "hound",
- "lewton",
- "minimp3",
-]
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -1851,34 +1483,17 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
-[[package]]
-name = "shlex"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-
 [[package]]
 name = "slab"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
 
-[[package]]
-name = "slice-deque"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25"
-dependencies = [
- "libc",
- "mach 0.3.2",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "slotmap"
-version = "0.4.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61b40583e0c1bd3100652ba8940939decc8808e7b2a07f4f4606c6a8a40035a"
+checksum = "c46a3482db8f247956e464d783693ece164ca056e6e67563ee5505bdb86452cd"
 
 [[package]]
 name = "smallvec"
@@ -1926,12 +1541,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "stdweb"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
-
 [[package]]
 name = "stdweb"
 version = "0.4.20"
@@ -2026,18 +1635,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.26"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2"
+checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.26"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745"
+checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2050,21 +1659,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7572415bd688d401c52f6e36f4c8e805b9ae1622619303b9fa835d531db0acae"
 
-[[package]]
-name = "tinyvec"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -2236,9 +1830,9 @@ checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
 
 [[package]]
 name = "wayland-client"
-version = "0.28.6"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355"
+checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c"
 dependencies = [
  "bitflags",
  "downcast-rs",
@@ -2252,9 +1846,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-commons"
-version = "0.28.6"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda"
+checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a"
 dependencies = [
  "nix 0.20.0",
  "once_cell",
@@ -2264,9 +1858,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-cursor"
-version = "0.28.6"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a"
+checksum = "b37e5455ec72f5de555ec39b5c3704036ac07c2ecd50d0bffe02d5fe2d4e65ab"
 dependencies = [
  "nix 0.20.0",
  "wayland-client",
@@ -2275,9 +1869,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-protocols"
-version = "0.28.6"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
+checksum = "95df3317872bcf9eec096c864b69aa4769a1d5d6291a5b513f8ba0af0efbd52c"
 dependencies = [
  "bitflags",
  "wayland-client",
@@ -2287,9 +1881,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-scanner"
-version = "0.28.6"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1"
+checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2298,9 +1892,9 @@ dependencies = [
 
 [[package]]
 name = "wayland-sys"
-version = "0.28.6"
+version = "0.28.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8"
+checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2"
 dependencies = [
  "dlib 0.5.0",
  "lazy_static",
@@ -2447,8 +2041,8 @@ dependencies = [
  "log",
  "mio",
  "mio-extras",
- "ndk 0.2.1",
+ "ndk",
- "ndk-glue 0.2.1",
+ "ndk-glue",
  "ndk-sys",
  "objc",
  "parking_lot",
@@ -2506,7 +2100,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a9a231574ae78801646617cefd13bfe94be907c0e4fa979cfd8b770aa3c5d08"
 dependencies = [
- "nom 6.2.1",
+ "nom",
 ]
 
 [[package]]

Cargo.toml

@@ -15,10 +15,8 @@ pixels = "^0.3"
 winit = "^0.24"
 winit_input_helper = "^0.9"
 egui = "^0.10"
-egui_wgpu_backend = { git="https://github.com/hasenbanck/egui_wgpu_backend.git", rev="9d03ad345d15d1e44165849b242d3562fdf3e859" }
+egui_wgpu_backend = { git = "https://github.com/hasenbanck/egui_wgpu_backend.git", rev = "9d03ad345d15d1e44165849b242d3562fdf3e859" }
-egui_winit_platform = { git="https://github.com/hasenbanck/egui_winit_platform.git", rev="17298250e9721e8bf2c1d4a17b3e22777f8cb2e8" }
+egui_winit_platform = { git = "https://github.com/hasenbanck/egui_winit_platform.git", rev = "17298250e9721e8bf2c1d4a17b3e22777f8cb2e8" }
-rodio = "^0.14"
-crossbeam-channel = "^0.5"
 
 [profile.release]
 debug = true

src/bus.rs

@@ -4,7 +4,7 @@ use crate::interrupt::{Interrupt, InterruptFlag};
 use crate::joypad::Joypad;
 use crate::ppu::{Ppu, PpuMode};
 use crate::serial::Serial;
-use crate::sound::{SampleSender, Sound};
+use crate::sound::Sound;
 use crate::timer::Timer;
 use crate::work_ram::{VariableWorkRam, WorkRam};
 use std::{fs::File, io::Read};
@@ -66,10 +66,6 @@ impl Bus {
         self.cartridge.as_ref()?.title()
     }
 
-    pub(crate) fn pass_audio_src(&mut self, sender: SampleSender) {
-        self.snd.set_audio_src(sender)
-    }
-
     pub(crate) fn clock(&mut self) {
         self.ppu.clock();
         self.timer.clock();
@@ -237,7 +233,7 @@ impl BusIo for Bus {
                     0x23 => self.snd.ch4.freq_data(),
                     0x24 => self.snd.ctrl.channel.into(),
                     0x25 => self.snd.ctrl.output.into(),
-                    0x26 => self.snd.ctrl.status(&self.snd),
+                    0x26 => self.snd.ctrl.status.into(),
                     0x30..=0x3F => self.snd.ch3.wave_ram[addr as usize - 0xFF30],
                     0x40 => self.ppu.ctrl.into(),
                     0x41 => self.ppu.stat.into(),
@@ -355,7 +351,7 @@ impl BusIo for Bus {
                     0x23 => self.snd.ch4.set_freq_data(byte),
                     0x24 => self.snd.ctrl.channel = byte.into(),
                     0x25 => self.snd.ctrl.output = byte.into(),
-                    0x26 => self.snd.ctrl.set_status(byte), // FIXME: Should we control which bytes are written to here?
+                    0x26 => self.snd.ctrl.status = byte.into(), // FIXME: Should we control which bytes are written to here?
                     0x30..=0x3F => self.snd.ch3.wave_ram[addr as usize - 0xFF30] = byte,
                     0x40 => self.ppu.ctrl = byte.into(),
                     0x41 => self.ppu.stat.update(byte),

src/cpu.rs

@@ -3,7 +3,6 @@ use crate::instruction::{Cycle, Instruction};
 use crate::interrupt::{InterruptEnable, InterruptFlag};
 use crate::joypad::Joypad;
 use crate::ppu::Ppu;
-use crate::sound::SampleSender;
 use crate::timer::Timer;
 use bitfield::bitfield;
 use std::fmt::{Display, Formatter, Result as FmtResult};
@@ -45,10 +44,6 @@ impl Cpu {
         })
     }
 
-    pub fn set_audio_src(&mut self, sender: SampleSender) {
-        self.bus.pass_audio_src(sender)
-    }
-
     pub(crate) fn ime(&self) -> ImeState {
         self.ime
     }

src/emu.rs

@@ -4,12 +4,11 @@ use crate::joypad;
 use crate::ppu::Ppu;
 use anyhow::Result;
 use gilrs::Gilrs;
-use rodio::OutputStreamHandle;
 use std::time::Duration;
 
 pub const SM83_CYCLE_TIME: Duration = Duration::from_nanos(1_000_000_000 / SM83_CLOCK_SPEED);
 pub const CYCLES_IN_FRAME: Cycle = Cycle::new(456 * 154); // 456 Cycles times 154 scanlines
-pub(crate) const SM83_CLOCK_SPEED: u64 = 0x40_0000; // Hz which is 4.194304Mhz
+const SM83_CLOCK_SPEED: u64 = 0x40_0000; // Hz which is 4.194304Mhz
 const DEFAULT_TITLE: &str = "DMG-01 Emulator";
 
 pub fn init(boot_path: Option<&str>, rom_path: &str) -> Result<SM83> {

src/instruction.rs

@@ -2277,13 +2277,13 @@ impl From<Cycle> for u32 {
 
 impl InstrRegisterPair {
     fn to_register_pair(self) -> RegisterPair {
-        RegisterPair::try_from(self).expect("InstrRegisterPair is a valid RegisterPair")
+        RegisterPair::try_from(self).expect("Failed to convert InstrRegisterPair to RegisterPair")
     }
 }
 
 impl InstrRegister {
     fn to_register(self) -> Register {
-        Register::try_from(self).expect("InstrRegister is a valid Register")
+        Register::try_from(self).expect("Failed to convert from InstrRegister to Register")
     }
 }
 

src/lib.rs

@@ -1,6 +1,5 @@
 pub use gui::Egui;
 pub use instruction::Cycle;
-pub use sound::AudioSenderReceiver;
 
 pub const GB_WIDTH: usize = 160;
 pub const GB_HEIGHT: usize = 144;

src/main.rs

@@ -1,14 +1,12 @@
 use anyhow::{anyhow, Result};
 use clap::{crate_authors, crate_description, crate_name, crate_version, App, Arg};
-use gb::{AudioSenderReceiver, Cycle, Egui, GB_HEIGHT, GB_WIDTH};
+use gb::{Cycle, Egui, GB_HEIGHT, GB_WIDTH};
 use gilrs::Gilrs;
 use pixels::{Pixels, SurfaceTexture};
-use rodio::{OutputStream, Sink};
 use std::time::Instant;
 use winit::dpi::LogicalSize;
 use winit::event::{Event, VirtualKeyCode};
 use winit::event_loop::{ControlFlow, EventLoop};
-use winit::platform::windows::WindowBuilderExtWindows;
 use winit::window::{Window, WindowBuilder};
 use winit_input_helper::WinitInputHelper;
 
@@ -41,16 +39,14 @@ fn main() -> Result<()> {
 
     // `rom` is a required value in every situation so this will
     // always exist.
-    let rom_path = m
+    let rom_path = m.value_of("rom").unwrap();
-        .value_of("rom")
-        .expect("Required value 'rom' was provided");
 
     let mut game_boy =
-        gb::emu::init(m.value_of("boot"), rom_path).expect("Initialized DMG-01 Emulator");
+        gb::emu::init(m.value_of("boot"), rom_path).expect("Failed to initialize DMG-01 Emulator");
     let cartridge_title = gb::emu::rom_title(&game_boy);
 
     // Initialize Gamepad Support
-    let mut gamepad = Gilrs::new().expect("Initialized Gilrs for Controller Input");
+    let mut gamepad = Gilrs::new().expect("Failed to initialize Gilrs");
 
     // Initialize GUI
     let event_loop = EventLoop::new();
@@ -67,19 +63,6 @@ fn main() -> Result<()> {
         (pixels, egui)
     };
 
-    let (send, recv) = AudioSenderReceiver::new();
-    game_boy.set_audio_src(send);
-
-    // Initialize Audio
-    let (_stream, stream_handle) = OutputStream::try_default().expect("Initialized Audio");
-    let sink = Sink::try_new(&stream_handle).expect("Initialize Audio Sink");
-
-    std::thread::spawn(move || {
-        sink.append(recv);
-
-        sink.sleep_until_end();
-    });
-
     let mut now = Instant::now();
     let mut cycle_count: Cycle = Default::default();
 
@@ -150,6 +133,5 @@ fn create_window(event_loop: &EventLoop<()>, title: &str) -> Result<Window> {
         .with_resizable(true)
         .with_decorations(true)
         .with_transparent(false)
-        .with_drag_and_drop(false) // OleInitialize failed error if this is set to true
         .build(event_loop)?)
 }

src/ppu.rs

@@ -278,7 +278,7 @@ impl Ppu {
                         .obj
                         .tile
                         .bytes()
-                        .expect("Tile high & low bytes are present");
+                        .expect("Failed to unwrap Tile bytes");
 
                     let tbpp = Pixels::from_bytes(high, low);
 
@@ -539,7 +539,7 @@ impl ObjectAttributeTable {
 
         let slice: &[u8; 4] = self.buf[start..(start + 4)]
             .try_into()
-            .expect("TryInto trait called on a &[u8; 4]");
+            .expect("Could not interpret &[u8] as a &[u8; 4]");
 
         slice.into()
     }
@@ -704,7 +704,7 @@ impl PixelFetcher {
         let scroll_y = pos.scroll_y;
         let is_window = self.back.is_window_tile();
 
-        let id = self.back.tile.id.expect("Tile Number is present");
+        let id = self.back.tile.id.expect("Tile Number unexpectedly missing");
 
         let tile_data_addr = match control.tile_data_addr() {
             TileDataAddress::X8800 => 0x9000u16.wrapping_add(((id as i8) as i16 * 16) as u16),
@@ -721,11 +721,7 @@ impl PixelFetcher {
     }
 
     fn send_to_fifo(&self, fifo: &mut FifoRenderer, palette: &BackgroundPalette) {
-        let (high, low) = self
+        let (high, low) = self.back.tile.bytes().expect("Failed to unwrap Tile bytes");
-            .back
-            .tile
-            .bytes()
-            .expect("Tile high & low bytes are present");
 
         let tbpp = Pixels::from_bytes(high, low);
 

src/ppu/dma.rs

@@ -30,7 +30,7 @@ impl DirectMemoryAccess {
                     .start
                     .addr
                     .as_mut()
-                    .expect("Source Address present during DMA Transfer");
+                    .expect("DMA Transfer Attempted without a known source address");
 
                 let addresses = if (self.cycle - 4) % 4 == 0 {
                     *src_addr += 1;

src/sound.rs

@@ -1,15 +1,8 @@
 use bitfield::bitfield;
-use crossbeam_channel::{Receiver, Sender};
-use rodio::Source;
-
-use crate::emu::SM83_CLOCK_SPEED;
-use crate::Cycle;
 
 const WAVE_PATTERN_RAM_LEN: usize = 0x10;
-const SAMPLE_RATE: u32 = 4800; // Hz
-const SAMPLE_RATE_IN_CYCLES: Cycle = Cycle::new((SM83_CLOCK_SPEED / SAMPLE_RATE as u64) as u32);
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone, Copy, Default)]
 pub(crate) struct Sound {
     pub(crate) ctrl: SoundControl,
     /// Tone & Sweep
@@ -24,15 +17,11 @@ pub(crate) struct Sound {
     // Frame Sequencer
     frame_seq_state: FrameSequencerState,
     div_prev: Option<u8>,
-
-    sender: Option<SampleSender>,
-    cycle: Cycle,
 }
 
 impl Sound {
     pub(crate) fn clock(&mut self, div: u16) {
         use FrameSequencerState::*;
-        self.cycle += 1;
 
         // the 5th bit of the high byte
         let bit_5 = (div >> 13 & 0x01) as u8;
@@ -60,24 +49,6 @@ impl Sound {
         }
 
         self.div_prev = Some(bit_5);
-
-        // TODO: Should the FrameSequencer be run first?
-        if self.cycle > SAMPLE_RATE_IN_CYCLES {
-            // Sample the APU
-            self.cycle %= SAMPLE_RATE_IN_CYCLES;
-
-            let left_sample = self.ch2.clock();
-            let right_sample = self.ch2.clock();
-
-            if let Some(send) = self.sender.as_ref() {
-                send.add_sample(left_sample);
-                send.add_sample(right_sample);
-            }
-        }
-    }
-
-    pub(crate) fn set_audio_src(&mut self, sender: SampleSender) {
-        self.sender = Some(sender);
     }
 
     fn handle_length(&mut self) {
@@ -242,25 +213,8 @@ pub(crate) struct SoundControl {
     pub(crate) channel: ChannelControl,
     /// 0xFF25 | NR51 - Selection of Sound output terminal
     pub(crate) output: SoundOutput,
-
-    enabled: bool,
-}
-
-impl SoundControl {
     /// 0xFF26 | NR52 - Sound On/Off
-    pub fn status(&self, snd: &Sound) -> u8 {
+    pub(crate) status: SoundStatus,
-        (self.enabled as u8) << 7
-            | (snd.ch4.enabled as u8) << 3
-            | (snd.ch3.enabled as u8) << 2
-            | (snd.ch2.enabled as u8) << 1
-            | snd.ch1.enabled as u8
-    }
-
-    /// 0xFF26 | NR52 - Sound On/Off
-    pub fn set_status(&mut self, byte: u8) {
-        // TODO: Should all channel enabled fields be disabled when this is reset?
-        self.enabled = (byte >> 7) & 0x01 == 0x01;
-    }
 }
 
 // TODO: What to do about the separation of freq bits
@@ -513,25 +467,10 @@ pub(crate) struct Channel2 {
     // Length Functionality
     length_timer: u16,
 
-    freq_timer: u16,
-    duty_pos: u8,
-
     enabled: bool,
 }
 
 impl Channel2 {
-    fn clock(&mut self) -> u8 {
-        self.freq_timer -= 1;
-
-        if self.freq_timer == 0 {
-            // TODO: Why is this 2048?
-            self.freq_timer = (2048 - self.frequency()) * 4;
-            self.duty_pos = (self.duty_pos + 1) % 8;
-        }
-
-        self.duty.wave_pattern().amplitude(self.duty_pos)
-    }
-
     /// 0xFF16 | NR21 - Channel 2 Sound length / Wave Pattern Duty
     pub(crate) fn duty(&self) -> u8 {
         self.duty.into()
@@ -563,10 +502,6 @@ impl Channel2 {
             }
         }
     }
-
-    fn frequency(&self) -> u16 {
-        (self.freq_hi.freq_bits() as u16) << 8 | self.freq_lo as u16
-    }
 }
 
 bitfield! {
@@ -670,20 +605,6 @@ pub enum WavePattern {
     ThreeQuarters = 3, // 75%   ( ______--______--______-- )
 }
 
-impl WavePattern {
-    pub const fn amplitude(&self, index: u8) -> u8 {
-        use WavePattern::*;
-        let i = 7 - index; // an index of 0 should get the highest bit
-
-        match *self {
-            OneEighth => (0b00000001 >> i) & 0x01,
-            OneQuarter => (0b10000001 >> i) & 0x01,
-            OneHalf => (0b10000111 >> i) & 0x01,
-            ThreeQuarters => (0b01111110 >> i) & 0x01,
-        }
-    }
-}
-
 impl Default for WavePattern {
     fn default() -> Self {
         Self::OneEighth // Rationale: OneEighth is 0x00
@@ -1026,62 +947,3 @@ impl From<ChannelControl> for u8 {
         ctrl.0
     }
 }
-
-pub struct AudioSenderReceiver;
-
-impl AudioSenderReceiver {
-    pub fn new() -> (SampleSender, SampleReceiver) {
-        let (send, recv) = crossbeam_channel::unbounded();
-
-        (SampleSender { send }, SampleReceiver { recv })
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct SampleSender {
-    send: Sender<u8>,
-}
-
-impl SampleSender {
-    fn add_sample(&self, sample: u8) {
-        self.send
-            .send(sample)
-            .expect("Send audio sample across threads");
-    }
-}
-
-pub struct SampleReceiver {
-    recv: Receiver<u8>,
-}
-
-impl Iterator for SampleReceiver {
-    type Item = f32;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // TODO: Should this never return none?
-        self.recv.recv().ok().map(|num| num as f32)
-    }
-}
-
-impl Source for SampleReceiver {
-    fn current_frame_len(&self) -> Option<usize> {
-        // A frame changes when the samples rate or
-        // number of channels change. This will never happen, so
-        // we return
-        None
-    }
-
-    fn channels(&self) -> u16 {
-        // The Gameboy supports two channels
-        2
-    }
-
-    fn sample_rate(&self) -> u32 {
-        SAMPLE_RATE
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        // The duration of this source is infinite
-        None
-    }
-}