1
0
Fork 0

Use upstream egui-baseview

Now that all patches have been merged.
This commit is contained in:
Robbert van der Helm 2022-09-22 19:42:03 +02:00
parent fff713d066
commit d3fe4c0d06
2 changed files with 23 additions and 6 deletions

24
Cargo.lock generated
View file

@ -394,6 +394,24 @@ dependencies = [
"xcb-util", "xcb-util",
] ]
[[package]]
name = "baseview"
version = "0.1.0"
source = "git+https://github.com/RustAudio/baseview.git?rev=eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c#eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c"
dependencies = [
"cocoa",
"core-foundation 0.9.3",
"keyboard-types",
"nix 0.22.3",
"objc",
"raw-window-handle",
"uuid",
"winapi",
"x11",
"xcb 0.9.0",
"xcb-util",
]
[[package]] [[package]]
name = "bindgen" name = "bindgen"
version = "0.59.2" version = "0.59.2"
@ -1199,9 +1217,9 @@ dependencies = [
[[package]] [[package]]
name = "egui-baseview" name = "egui-baseview"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/robbert-vdh/egui-baseview.git?branch=fix/update-dependencies#c2e7281f1129482f0aef564cae42b3e7a26a6373" source = "git+https://github.com/BillyDM/egui-baseview.git?rev=46e21cc11c57c705fb83611389399ec3d2670a44#46e21cc11c57c705fb83611389399ec3d2670a44"
dependencies = [ dependencies = [
"baseview 0.1.0 (git+https://github.com/robbert-vdh/baseview.git?branch=feature/mouse-event-modifiers)", "baseview 0.1.0 (git+https://github.com/RustAudio/baseview.git?rev=eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c)",
"copypasta 0.8.1", "copypasta 0.8.1",
"egui", "egui",
"egui_glow", "egui_glow",
@ -2670,7 +2688,7 @@ dependencies = [
name = "nih_plug_egui" name = "nih_plug_egui"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"baseview 0.1.0 (git+https://github.com/robbert-vdh/baseview.git?branch=feature/mouse-event-modifiers)", "baseview 0.1.0 (git+https://github.com/RustAudio/baseview.git?rev=eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c)",
"crossbeam", "crossbeam",
"egui", "egui",
"egui-baseview", "egui-baseview",

View file

@ -14,11 +14,10 @@ opengl = []
[dependencies] [dependencies]
nih_plug = { path = ".." } nih_plug = { path = ".." }
baseview = { git = "https://github.com/robbert-vdh/baseview.git", branch = "feature/mouse-event-modifiers" } baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "eae4033e7d2cc9c31ccaa2794d5d08eedf2f510c" }
crossbeam = "0.8" crossbeam = "0.8"
egui = "0.19" egui = "0.19"
# Upstream doesn't work with the current baseview and egui versions egui-baseview = { git = "https://github.com/BillyDM/egui-baseview.git", rev = "46e21cc11c57c705fb83611389399ec3d2670a44" }
egui-baseview = { git = "https://github.com/robbert-vdh/egui-baseview.git", branch = "fix/update-dependencies" }
lazy_static = "1.4" lazy_static = "1.4"
parking_lot = "0.12" parking_lot = "0.12"
# To make the state persistable # To make the state persistable