VCC/vcs-controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: VCC:3a16194a5f17a7c9807a5273d0493246e2907be5
Branches Tags
VCC:main
VCC:pre-tauri
..
compare: VCC:3562bca493171ee44c51a341374c2567ee31ff16
Branches Tags
VCC:main
VCC:pre-tauri

No commits in common. "3a16194a5f17a7c9807a5273d0493246e2907be5" and "3562bca493171ee44c51a341374c2567ee31ff16" have entirely different histories.
3a16194a5f ... 3562bca493

9 changed files with 12 additions and 73 deletions
Show stats Expand all files Collapse all files

11
controller/src/coordinator/mod.rs
View file

@ -79,12 +79,11 @@ pub async fn start_coordinator(
jpeg_quality, jpeg_quality,
); );
// state state
// .pipeline .pipeline
// .pipeline .pipeline
// .set_state(State::Playing) .set_state(State::Playing)
// .expect("Could not set pipeline state to playing"); .expect("Could not set pipeline state to playing");
//
state.check_states().await; state.check_states().await;

8
controller/src/gstreamer_pipeline.rs
View file

@ -22,13 +22,7 @@ impl WebcamPipeline {
// All of the following errors are unrecoverable // All of the following errors are unrecoverable
let mut video_src = ""; let source = ElementFactory::make("mfvideosrc")
if cfg!(windows) {
video_src = "mfvideosrc";
} else if cfg!(unix) {
video_src = "v4l2src";
}
let source = ElementFactory::make(video_src)
.build() .build()
.context(BuildSnafu { .context(BuildSnafu {
element: "mfvideosrc", element: "mfvideosrc",

2
controller/src/main.rs
View file

@ -50,7 +50,7 @@ async fn main() {
let (to_mec, mec) = async_channel::bounded::<ApplicationEvent>(10); let (to_mec, mec) = async_channel::bounded::<ApplicationEvent>(10);
let _coordinator = tokio::spawn(start_coordinator( let coordinator = tokio::spawn(start_coordinator(
mec, mec,
to_mec.clone(), to_mec.clone(),
config config

5
controller/src/states/perf_state.rs
View file

@ -1,7 +1,5 @@
use std::{collections::VecDeque, time::Duration}; use std::{collections::VecDeque, time::Duration};
use tracing::info;
const MAX_RECORDED_TIMES: usize = 10; const MAX_RECORDED_TIMES: usize = 10;
const DEGRADED_TRACKER_TIME: u128 = 150; const DEGRADED_TRACKER_TIME: u128 = 150;
@ -25,8 +23,7 @@ impl TrackerMetrics {
} }
fn update_gui(&mut self) { fn update_gui(&mut self) {
info!("Trying to update the gui"); todo!("No gui channel sent yet");
// todo!("No gui channel sent yet");
} }
pub fn starting_connection(&mut self, fail_count: Option<usize>) { pub fn starting_connection(&mut self, fail_count: Option<usize>) {

2
controller/static/css/main.css
View file

File diff suppressed because one or more lines are too long

13
controller/static/feather.min.js vendored
View file

File diff suppressed because one or more lines are too long

39
controller/templates/index.html
View file

@ -1,49 +1,14 @@
<html lang="en"> <html lang="en">
<head> <head>
<link href="/static/css/main.css" rel="stylesheet"/> <link href="/static/css/main.css" rel="stylesheet"/>
<script src="/static/feather.min.js"></script>
<script src="/static/htmx@2.0.min.js"></script> <script src="/static/htmx@2.0.min.js"></script>
<script src="/static/index.js"></script> <script src="/static/index.js"></script>
</head> </head>
<body> <body>
<nav class="bg-cyan-500"> <div class="me-0 ms-auto justify-center text-white">
<div class="mx-auto max-w-7xl px-2 sm:px-6 lg:px-8"> Hello {{ name }}!
<div class="relative flex h-16 items-center justify-between">
<div class="flex flex-1 items-center justify-center sm:items-stretch sm:justify-start">
<div class="hidden sm:ml-6 sm:block">
<div class="flex space-x-4">
<!-- Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" -->
<a href="#" class="rounded-md bg-slate-800 px-3 py-2 text-sm font-medium text-white" aria-current="page">Dashboard</a>
</div> </div>
</div>
<div class="me-0 ms-auto py-2">
<button class="rounded-full p-2 hover:bg-cyan-700 transition-colors">
<i data-feather="menu"></i>
</button>
</div>
</div>
</div>
</div>
</nav>
<div class="flex flex-row h-dvh w-100">
<div class="flex flex-col bg-neutral-300 h-dvh w-1/8">
<button class="rounded-full font-semibold mx-3 mt-2 px-4 py-2 text-white bg-cyan-600">Connect to Camera</button>
<button class="rounded-full font-semibold mx-3 mt-2 px-4 py-2 text-white bg-cyan-600">Connect to Computer</button>
</div>
<div class="bg-emerald-700 h-dvh w-7/8">
</div>
</div>
<script>
feather.replace();
</script>
</body> </body>
</html> </html>

2
flake.nix
View file

@ -44,7 +44,6 @@ Some utility commands:
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-rs
]; ];
cargoHash = nixpkgs.lib.fakeHash; cargoHash = nixpkgs.lib.fakeHash;
}; };
@ -83,7 +82,6 @@ Some utility commands:
(pkgs.rust-bin.stable.latest.default.override { (pkgs.rust-bin.stable.latest.default.override {
extensions = [ "rust-src" ]; extensions = [ "rust-src" ];
}) })
cargo-watch
cargo-tauri cargo-tauri
cargo-edit cargo-edit
bacon bacon

3
src-tauri/tauri.conf.json
View file

@ -3,8 +3,7 @@
"beforeBuildCommand": "", "beforeBuildCommand": "",
"beforeDevCommand": "", "beforeDevCommand": "",
"devPath": "http://localhost:3241", "devPath": "http://localhost:3241",
"distDir": "http://localhost:3241", "distDir": "http://localhost:3241"
"withGlobalTauri": true
}, },
"package": { "package": {
"productName": "VCS-Controller", "productName": "VCS-Controller",