Changeset 33179

Timestamp:

02/18/15 17:33:09 (8 years ago)

Author:

gost

Message:

[plugins] ip-camera.. new camera type

Location:

titan

Files:

• plugins/instar/instar.h (modified) (5 diffs)
• skins/instar/skin.xml (modified) (2 diffs)

titan/plugins/instar/instar.h

@@ -33 +33 @@
                 if(cam1 != NULL)
                 {
-                        tmpstr = ostrcat(cam1, "/snapshot.cgi", 0, 0);
+                        if(getconfigint("instar_1", NULL) == 1)
+                                tmpstr = ostrcat(cam1, "/image/jpeg.cgi", 0, 0);
+                        else
+                                tmpstr = ostrcat(cam1, "/snapshot.cgi", 0, 0);
                         system(tmpstr);
                         free(tmpstr); tmpstr = NULL;
@@ -39 +42 @@
                 if(cam2 != NULL)
                 {
-                        tmpstr = ostrcat(cam2, "/snapshot.cgi", 0, 0);
+                        if(getconfigint("instar_2", NULL) == 1)
+                                tmpstr = ostrcat(cam1, "/image/jpeg.cgi", 0, 0);
+                        else
+                                tmpstr = ostrcat(cam1, "/snapshot.cgi", 0, 0);
                         system(tmpstr);
                         free(tmpstr); tmpstr = NULL;
@@ -197 +203 @@
         addchoicebox(onCam1, "ein", _("ein"));
         setchoiceboxselection(onCam1, getlist(myconfig, "InstarCam1", NULL));   
+        addchoicebox(typCam1, "0", "0");
+        addchoicebox(typCam1, "1", "1");
+        setchoiceboxselection(typCam1, getconfigint("instar_1", NULL));
         changemask(ipCam1, "abcdefghijklmnopqrstuvwxyz");
   changeinput(ipCam1, getlist(myconfig, "InstarCam1IP", NULL));
@@ -209 +218 @@
         addchoicebox(onCam2, "ein", _("ein"));
         setchoiceboxselection(onCam2, getlist(myconfig, "InstarCam2", NULL));   
+        addchoicebox(typCam2, "0", "0");
+        addchoicebox(typCam2, "1", "1");
+        setchoiceboxselection(typCam2, getconfigint("instar_2", NULL));
         changemask(ipCam2, "abcdefghijklmnopqrstuvwxyz");
   changeinput(ipCam2, getlist(myconfig, "InstarCam2IP", NULL));
@@ -243 +255 @@
                         addlist(myconfig, "InstarCam2Pass", passCam2->ret);
                         writelist(myconfig, instarconf);
+                        addconfig("instar_1", typCam1->ret);
+                        addconfig("instar_2", typCam2->ret);
                         if(rcret == getrcconfigint("rcblue", NULL))
                         {

titan/skins/instar/skin.xml

@@ -8 +8 @@
 <node name="autoCam" type="choicebox" parent="listbox" valign="top" posx="0" text="direkter Start" bordercol="bordercol" bordersize="2" width="100%" height="30">
 <node name="onCam1" type="choicebox" parent="listbox" valign="middle" posx="0" text="Kamera 1" bordercol="bordercol" bordersize="2" width="100%" height="25">
+<node name="typCam1" type="choicebox" parent="listbox" valign="middle" posx="0" text="Typ" bordercol="bordercol" bordersize="2" width="100%" height="25">
 <node name="ipCam1" type="inputbox" parent="listbox" valign="middle" posx="0" text="IP-Kamera 1" bordercol="bordercol" bordersize="2" width="100%" height="25">
 <node name="portCam1" type="inputboxnum" parent="listbox" valign="middle" posx="0" text="Port-Kamera 1" bordercol="bordercol" bordersize="2" width="100%" height="25">
@@ -14 +15 @@
 <node name="s1" type="inputbox" parent="listbox" valign="middle" posx="0" text=" " bordercol="bordercol" bordersize="2" width="100%" height="15">
 <node name="onCam2" type="choicebox" parent="listbox" valign="middle" posx="0" text="Kamera 2 (Umschalten mit Rot)" bordercol="bordercol" bordersize="2" width="100%" height="25">
+<node name="typCam2" type="choicebox" parent="listbox" valign="middle" posx="0" text="Typ" bordercol="bordercol" bordersize="2" width="100%" height="25">
 <node name="ipCam2" type="inputbox" parent="listbox" valign="middle" posx="0" text="IP-Kamera 2" bordercol="bordercol" bordersize="2" width="100%" height="25">
 <node name="portCam2" type="inputboxnum" parent="listbox" valign="middle" posx="0" text="Port-Kamera 2" bordercol="bordercol" bordersize="2" width="100%" height="25">