Skip to content

Commit

Permalink
fix: build issue
Browse files Browse the repository at this point in the history
  • Loading branch information
louis030195 committed Aug 8, 2024
1 parent a585f9b commit 8f4f9b4
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
21 changes: 11 additions & 10 deletions screenpipe-server/src/bin/screenpipe-server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ use crossbeam::queue::SegQueue;
use dirs::home_dir;
use log::{debug, error, info, LevelFilter};
use screenpipe_audio::{
default_input_device, default_output_device, list_audio_devices, parse_audio_device,
DeviceControl,
default_input_device, list_audio_devices, parse_audio_device, DeviceControl,
};
use screenpipe_vision::OcrEngine;
use std::io::Write;
Expand Down Expand Up @@ -235,14 +234,16 @@ async fn main() -> anyhow::Result<()> {
}
// audio output only supported on linux atm
// see https://github.com/louis030195/screen-pipe/pull/106
#[cfg(target_os = "linux")]
if let Ok(output_device) = default_output_device() {
audio_devices.push(Arc::new(output_device.clone()));
let device_control = DeviceControl {
is_running: true,
is_paused: false,
};
devices_status.insert(output_device, device_control);
if cfg!(target_os = "linux") {
use screenpipe_audio::default_output_device;
if let Ok(output_device) = default_output_device() {
audio_devices.push(Arc::new(output_device.clone()));
let device_control = DeviceControl {
is_running: true,
is_paused: false,
};
devices_status.insert(output_device, device_control);
}
}
} else {
// Use specified devices
Expand Down
3 changes: 2 additions & 1 deletion screenpipe-server/src/video.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ use chrono::Utc;
use image::ImageFormat::{self};
use log::{debug, error, info, warn};
use screenpipe_core::find_ffmpeg_path;
use screenpipe_vision::{continuous_capture, get_monitor, CaptureResult, OcrEngine};
use screenpipe_vision::core::get_monitor;
use screenpipe_vision::{continuous_capture, CaptureResult, OcrEngine};
use std::collections::VecDeque;
use std::path::PathBuf;
use std::process::Stdio;
Expand Down
2 changes: 1 addition & 1 deletion screenpipe-vision/src/apple.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use image::DynamicImage;
use std::ffi::{CStr, CString};
use std::ffi::CStr;
use std::os::raw::{c_char, c_uchar};

#[link(name = "ocr")]
Expand Down
2 changes: 1 addition & 1 deletion screenpipe-vision/src/bin/screenpipe-vision.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use clap::Parser;
use screenpipe_vision::{continuous_capture, get_monitor, OcrEngine};
use screenpipe_vision::{continuous_capture, core::get_monitor, OcrEngine};
use std::{sync::Arc, time::Duration};
use tokio::sync::mpsc::channel;

Expand Down
1 change: 0 additions & 1 deletion screenpipe-vision/src/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use crate::utils::OcrEngine;
use crate::utils::{
capture_screenshot, compare_with_previous_image, perform_ocr_tesseract, save_text_files,
};
use crate::utils::{perform_ocr_apple, OcrEngine};
use rusty_tesseract::{Data, DataOutput};
use screenpipe_integrations::unstructured_ocr::perform_ocr_cloud;
pub enum ControlMessage {
Expand Down
2 changes: 0 additions & 2 deletions screenpipe-vision/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
use crate::core::MaxAverageFrame;
// Assuming core.rs is in the same crate under the `core` module
use image::codecs::png::PngEncoder;
use image::DynamicImage;
use image_compare::{Algorithm, Metric, Similarity}; // Added import for Similarity
use log::{debug, error};
Expand Down

0 comments on commit 8f4f9b4

Please sign in to comment.