[Amsn-commits] msn msncam.tcl,1.53,1.54

[Alaoui Y. <kak...@us...>]

Update of /cvsroot/amsn/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26863

Modified Files:
	msncam.tcl 
Log Message:
changes to msncam.tcl to support only LOW res webcams too

Index: msncam.tcl
===================================================================
RCS file: /cvsroot/amsn/msn/msncam.tcl,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** msncam.tcl	27 May 2005 20:12:56 -0000	1.53
--- msncam.tcl	28 May 2005 21:50:14 -0000	1.54
***************
*** 380,384 ****
  
  	proc ReadFromSock { sock } {
- 		fileevent $sock readable ""
  
  
--- 380,383 ----
***************
*** 393,400 ****
  		set session [getObjOption $sid session]
  
- 
- 		fileevent $sock readable "::MSNCAM::ReadFromSock $sock"
- 
- 
  	 	if { [eof $sock] } {
   			status_log "WebCam Socket $sock closed\n"
--- 392,395 ----
***************
*** 503,508 ****
  						catch {puts -nonewline $fd $data}
  					}
  
! 					::CAMGUI::ShowCamFrame $sid $data
  				} else {
  					#AuthFailed $sid $sock
--- 498,505 ----
  						catch {puts -nonewline $fd $data}
  					}
+ 					fileevent $sock readable ""
  
! 					after 0 "::CAMGUI::ShowCamFrame $sid [list $data]; fileevent $sock readable \"::MSNCAM::ReadFromSock $sock\""
! 					#::CAMGUI::ShowCamFrame $sid $data
  				} else {
  					#AuthFailed $sid $sock
***************
*** 1146,1154 ****
  		set grab_proc [getObjOption $sid grab_proc]
  
- 		if { $encoder == "" } {
- 			set encoder [::Webcamsn::NewEncoder HIGH]
- 			setObjOption $socket codec $encoder
- 		}
- 
  		if { ![::CAMGUI::IsGrabberValid $grabber] } {
  			status_log "Invalid grabber : $grabber"
--- 1143,1146 ----
***************
*** 1275,1285 ****
  		}
  
  		if {[catch {$grab_proc $grabber $socket $encoder $img} res]} {
  			status_log "Trying to call the grabber but get an error $res\n" red
! 		}
  
  	}
  
  	proc Grab_Windows {grabber socket encoder img} {
  		if { ![catch { $grabber picture $img} res] } {
  			::MSNCAM::SendFrame $socket $encoder $img
--- 1267,1284 ----
  		}
  
+ 
  		if {[catch {$grab_proc $grabber $socket $encoder $img} res]} {
  			status_log "Trying to call the grabber but get an error $res\n" red
! 		} 
  
  	}
  
  	proc Grab_Windows {grabber socket encoder img} {
+ 
+ 		if { $encoder == "" } {
+ 			set encoder [::Webcamsn::NewEncoder HIGH]
+ 			setObjOption $socket codec $encoder
+ 		}
+ 
  		if { ![catch { $grabber picture $img} res] } {
  			::MSNCAM::SendFrame $socket $encoder $img
***************
*** 1292,1295 ****
--- 1291,1299 ----
  	proc Grab_Linux {grabber socket encoder img} {
  		if { ![catch { ::Capture::Grab $grabber $img} res] } {
+ 			if { $encoder == "" } {
+ 				if { $res == "" } { set res HIGH }
+ 				set encoder [::Webcamsn::NewEncoder $res]
+ 				setObjOption $socket codec $encoder
+ 			}
  			::MSNCAM::SendFrame $socket $encoder $img
  		} else {
***************
*** 1300,1303 ****
--- 1304,1313 ----
  
  	proc Grab_Mac { grabber socket encoder img } {
+ 
+ 		if { $encoder == "" } {
+ 			set encoder [::Webcamsn::NewEncoder HIGH]
+ 			setObjOption $socket codec $encoder
+ 		}
+ 
  		if {[winfo ismapped $grabber]} {
  			set socker_ [getObjOption $img socket]
***************
*** 2014,2021 ****
  		set img [image create photo]
  		label $preview -image $img
! 		button $settings -text "Camera Settings" -command ".webcam_preview property_page filter"
  
  		frame $buttons -relief sunken -borderwidth 3
! 		button $buttons.ok -text "Ok" -command "::CAMGUI::Choose_OkWindows $window $devs.list $img $devices"
  		button $buttons.cancel -text "Cancel" -command  "::CAMGUI::Choose_CancelWindows $window $img $preview"
  		wm protocol $window WM_DELETE_WINDOW   "::CAMGUI::Choose_CancelWindows $window $img $preview"
--- 2024,2031 ----
  		set img [image create photo]
  		label $preview -image $img
! 		button $settings -text "Camera Settings" -command ".webcam_preview propertypage filter"
  
  		frame $buttons -relief sunken -borderwidth 3
! 		button $buttons.ok -text "Ok" -command "::CAMGUI::Choose_OkWindows $window $devs.list $img [list $devices]"
  		button $buttons.cancel -text "Cancel" -command  "::CAMGUI::Choose_CancelWindows $window $img $preview"
  		wm protocol $window WM_DELETE_WINDOW   "::CAMGUI::Choose_CancelWindows $window $img $preview"
***************
*** 2127,2131 ****
  			}
  			incr size +24
! 			::Webcamsn::Decode $decoder $img $data
  			set data [string range $data $size end]
  			after 250 "incr $semaphore"
--- 2137,2141 ----
  			}
  			incr size +24
! 			catch { ::Webcamsn::Decode $decoder $img $data}
  			set data [string range $data $size end]
  			after 250 "incr $semaphore"