Xtt stream translations and option fix

xtt/lib/xtt/gtk/xtt_multiview_gtk.cpp

@@ -732,7 +732,21 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
 	  lsts = gdh_GetObjectInfoAttrref( &aref, (pwr_tAddress)&xttcamera, sizeof(xttcamera));
 	  if (EVEN(lsts)) break;
 
-	  unsigned int options = xttcamera.Options;
+	  unsigned int options = 0;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_FullScreen)
+	    options |= strm_mOptions_FullScreen;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_Maximize)
+	    options |= strm_mOptions_Maximize;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_FullMaximize)
+	    options |= strm_mOptions_FullMaximize;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_Iconify)
+	    options |= strm_mOptions_Iconify;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_CameraControlPanel)
+	    options |= strm_mOptions_CameraControlPanel;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_HttpBasicAuthentication)
+	    options |= strm_mOptions_HttpBasicAuthentication;
+	  if ( xttcamera.Options & pwr_mCameraOptionsMask_CgiParameterAuthentication)
+	    options |= strm_mOptions_CgiParameterAuthentication;
 
 	  strmctx[i*rows + j] = new XttStreamGtk( toplevel, this, "No title", 
 						  xttcamera.URL,

xtt/lib/xtt/src/xtt_stream.cpp

@@ -75,7 +75,7 @@ XttStream::XttStream( void *st_parent_ctx, const char *name, const char *st_uri,
 
   strncpy( uri, st_uri, sizeof(uri)); 
   if ( st_scan_time < 0.02)
-    scan_time = 1000;
+    scan_time = 250;
   else
     scan_time = 1000 * st_scan_time;
 
@@ -135,7 +135,7 @@ XttStream::XttStream( void *st_parent_ctx, const char *name, const char *st_uri,
   }
   if ( stream_width == 0 || stream_height == 0) {
     stream_width = 700;
-    stream_width = 580;
+    stream_height = 580;
   }
   stream_ratio = ((float)stream_width)/stream_height;
 

xtt/lib/xtt/src/xtt_xnav_command.cpp

@@ -280,7 +280,7 @@ dcli_tCmdTable	xnav_command_table[] = {
 			  "/FULLSCREEN", "/MAXIMIZE", "/FULLMAXIMIZE", "/ICONIFY", "/HIDE", 
 			  "/XPOSITION", "/YPOSITION", "/X0", "/Y0", "/X1", "/Y1", "/URL", "/CONTINOUS", 
 			  "/CAMERAPOSITION", "/CAMERACONTROLPANEL", "/VIDEOCONTROLPANEL", 
-			  "/VIDEOPROGRESSBAR", ""}
+			  "/VIDEOPROGRESSBAR", "/SCANTIME", ""}
 		},
 		{
 			"CLOSE",
@@ -3534,6 +3534,7 @@ static int	xnav_open_func(	void		*client_data,
     char tmp_str[80];
     int width, height;
     int x, y;
+    float scantime;
     unsigned int options = 0;
     pwr_tString80 name_str;
     int nr;
@@ -3700,13 +3701,23 @@ static int	xnav_open_func(	void		*client_data,
       else
 	y = 0;
 
+      if ( ODD( dcli_get_qualifier( "/SCANTIME", tmp_str, sizeof(tmp_str)))) {
+	nr = sscanf( tmp_str, "%f", &scantime);
+	if ( nr != 1) {
+	  xnav->message('E', "Syntax error in scantime");
+	  return XNAV__HOLDCOMMAND;
+	}
+      }
+      else
+       scantime = 0;
+
       XttStream *strmctx;
 
       if ( xnav->appl.find( applist_eType_Stream, name_str, url_str, (void **) &strmctx)) {
 	strmctx->pop();
       }
       else {
-	strmctx = xnav->stream_new( name_str, url_str, width, height, x, y, 0, options, 0, 0, &sts);
+	strmctx = xnav->stream_new( name_str, url_str, width, height, x, y, scantime, options, 0, 0, &sts);
 	if ( EVEN(sts)) {
 	  xnav->message(' ', XNav::get_message(sts));
 	  return sts;

xtt/mmi/xtt/en_us/xtt_lng.dat

@@ -458,6 +458,36 @@ E 1.18.8 "Go back"
 E 1.18.9 "Previous topic"
 E 1.18.10 "Next topic"
 #
+# Stream window
+E 1.19.1 "Page down"
+E 1.19.2 "Page up"
+E 1.19.3 "Down"
+E 1.19.4 "Up"
+E 1.19.5 "Preset position 1"
+E 1.19.6 "Preset position 2"
+E 1.19.7 "Preset position 3"
+E 1.19.8 "Preset position 4"
+E 1.19.9 "Preset position 5"
+E 1.19.10 "Preset position 6"
+E 1.19.11 "Preset position 7"
+E 1.19.12 "Preset position 8"
+E 1.19.13 "Preset position 9"
+E 1.19.14 "Preset position 10"
+E 1.19.15 "Position 1"
+E 1.19.16 "Position 2"
+E 1.19.17 "Position 3"
+E 1.19.18 "Position 4"
+E 1.19.19 "Position 5"
+E 1.19.20 "Position 6"
+E 1.19.21 "Position 7"
+E 1.19.22 "Position 8"
+E 1.19.23 "Position 9"
+E 1.19.24 "Position 10"
+E 1.19.25 "Preset store"
+E 1.19.26 "Get position"
+E 1.19.27 "Left"
+E 1.19.28 "Right"
+#
 # Postscript printing
 E 2.1.1 "Contents"
 E 2.1.2 "page"

xtt/mmi/xtt/sv_se/xtt_lng.dat

@@ -455,6 +455,36 @@ E 1.18.8 "G
 E 1.18.9 "Fregende mne"
 E 1.18.10 "Nsta mne"
 #
+# Stream window
+E 1.19.1 "Sida ner"
+E 1.19.2 "Sida upp"
+E 1.19.3 "Ner"
+E 1.19.4 "Upp"
+E 1.19.5 "Frinstlld position 1"
+E 1.19.6 "Frinstlld position 2"
+E 1.19.7 "Frinstlld position 3"
+E 1.19.8 "Frinstlld position 4"
+E 1.19.9 "Frinstlld position 5"
+E 1.19.10 "Frinstlld position 6"
+E 1.19.11 "Frinstlld position 7"
+E 1.19.12 "Frinstlld position 8"
+E 1.19.13 "Frinstlld position 9"
+E 1.19.14 "Frinstlld position 10"
+E 1.19.15 "Position 1"
+E 1.19.16 "Position 2"
+E 1.19.17 "Position 3"
+E 1.19.18 "Position 4"
+E 1.19.19 "Position 5"
+E 1.19.20 "Position 6"
+E 1.19.21 "Position 7"
+E 1.19.22 "Position 8"
+E 1.19.23 "Position 9"
+E 1.19.24 "Position 10"
+E 1.19.25 "Frinstlld lagra"
+E 1.19.26 "Visa position"
+E 1.19.27 "Vnster"
+E 1.19.28 "Hger"
+#
 # Postscript printing
 E 2.1.1 "Innehll"
 E 2.1.2 "sidan"