Vincent/robospot-camera-finder
1
0
Fork 0
Code Pull Requests Releases 3 Activity

optimize stream viewer usage

Browse Source
This commit is contained in:
Vincent BOUQUET
2025-06-01 12:34:36 +02:00
parent de4d535edc
commit eb0d30384d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MainForm.cs
View File

@@ -445,7 +445,7 @@ namespace robospot_camera_finder
{ {
toolStripStatusLabel.Text = "Loading camera..."; toolStripStatusLabel.Text = "Loading camera...";
Camera camera = all_cameras.FirstOrDefault<Camera>(cam => cam.camera_ip.ToString() == lbMain.SelectedValue.ToString()); Camera camera = all_cameras.FirstOrDefault<Camera>(cam => cam.camera_ip.ToString() == lbMain.SelectedValue.ToString());
Form viewer = new StreamViewer(lbMain.GetItemText(lbMain.SelectedItem), lbMain.SelectedValue.ToString(), camera, this); Form viewer = new StreamViewer(camera, this);
viewer.Show(); viewer.Show();
toolStripStatusLabel.Text = ""; toolStripStatusLabel.Text = "";
} }

18
StreamViewer.cs
View File

@@ -8,29 +8,29 @@ namespace robospot_camera_finder
public LibVLC _libVLC; public LibVLC _libVLC;
public MediaPlayer _mp; public MediaPlayer _mp;
string cam_ip = ""; MainForm.Camera camera;
int max_zoom_pulse = 9999; int max_zoom_pulse = 9999;
int min_zoom_pulse = 10; int min_zoom_pulse = 10;
bool zoomTestSeqFlag = false; bool zoomTestSeqFlag = false;
public StreamViewer(string name, string ip, MainForm.Camera camera, MainForm mainForm) public StreamViewer(MainForm.Camera cam, MainForm mainForm)
{ {
InitializeComponent(); InitializeComponent();
_libVLC = new LibVLC(); _libVLC = new LibVLC();
_mp = new MediaPlayer(_libVLC); _mp = new MediaPlayer(_libVLC);
cam_ip = ip; camera = cam;
this.Text = name; this.Text = camera.camera_name;
if (!cam_ip.StartsWith("10.")) if (!cam.camera_ip.StartsWith("10."))
{ {
MessageBox.Show("Camera is not on the 10.0.0.0/8 network, the RoboSpot might not find it.", "Wrong IP", MessageBoxButtons.OK, MessageBoxIcon.Warning); MessageBox.Show("Camera is not on the 10.0.0.0/8 network, the RoboSpot might not find it.", "Wrong IP", MessageBoxButtons.OK, MessageBoxIcon.Warning);
} }
string rtsp_link = "rtsp://" + ip + "/profile2/media.smp"; string rtsp_link = "rtsp://" + camera.camera_ip + "/profile2/media.smp";
updateZoomSlider(); updateZoomSlider();
@@ -45,7 +45,7 @@ namespace robospot_camera_finder
private void updateZoomSlider() private void updateZoomSlider()
{ {
HttpWebRequest request = (HttpWebRequest)WebRequest.Create("http://" + cam_ip + "/stw-cgi/ptzcontrol.cgi?msubmenu=query&action=view&Query=Zoom"); HttpWebRequest request = (HttpWebRequest)WebRequest.Create("http://" + camera.camera_ip + "/stw-cgi/ptzcontrol.cgi?msubmenu=query&action=view&Query=Zoom");
request.Credentials = new NetworkCredential(MainForm.cam_username, MainForm.cam_password); request.Credentials = new NetworkCredential(MainForm.cam_username, MainForm.cam_password);
HttpWebResponse response = (HttpWebResponse)request.GetResponse(); HttpWebResponse response = (HttpWebResponse)request.GetResponse();
string text; string text;
@@ -68,7 +68,7 @@ namespace robospot_camera_finder
zoom_pulse = max_zoom_pulse.ToString(); zoom_pulse = max_zoom_pulse.ToString();
} }
HttpWebRequest request = (HttpWebRequest)WebRequest.Create("http://" + cam_ip + "/stw-cgi/ptzcontrol.cgi?msubmenu=absolute&action=control&ZoomPulse=" + zoom_pulse); HttpWebRequest request = (HttpWebRequest)WebRequest.Create("http://" + camera.camera_ip + "/stw-cgi/ptzcontrol.cgi?msubmenu=absolute&action=control&ZoomPulse=" + zoom_pulse);
request.Credentials = new NetworkCredential(MainForm.cam_username, MainForm.cam_password); request.Credentials = new NetworkCredential(MainForm.cam_username, MainForm.cam_password);
HttpWebResponse response = (HttpWebResponse)request.GetResponse(); HttpWebResponse response = (HttpWebResponse)request.GetResponse();
} }
@@ -76,7 +76,7 @@ namespace robospot_camera_finder
private void sendZoomValueManual(string zoom_value) private void sendZoomValueManual(string zoom_value)
{ {
HttpWebRequest request = (HttpWebRequest)WebRequest.Create("http://" + cam_ip + "/stw-cgi/ptzcontrol.cgi?msubmenu=continuous&NormalizedSpeed=True&action=control&Channel=0&Zoom=" + zoom_value); HttpWebRequest request = (HttpWebRequest)WebRequest.Create("http://" + camera.camera_ip + "/stw-cgi/ptzcontrol.cgi?msubmenu=continuous&NormalizedSpeed=True&action=control&Channel=0&Zoom=" + zoom_value);
request.Credentials = new NetworkCredential(MainForm.cam_username, MainForm.cam_password); request.Credentials = new NetworkCredential(MainForm.cam_username, MainForm.cam_password);
HttpWebResponse response = (HttpWebResponse)request.GetResponse(); HttpWebResponse response = (HttpWebResponse)request.GetResponse();
} }