gatos-cvs Mailing List for GATOS (Page 9)
Status: Beta
Brought to you by:
volodya
Menu
▾
▴
gatos-cvs
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(35) |
Feb
(67) |
Mar
(41) |
Apr
(4) |
May
(7) |
Jun
(9) |
Jul
(7) |
Aug
(2) |
Sep
(9) |
Oct
(3) |
Nov
(5) |
Dec
(30) |
| 2004 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
(6) |
Jul
(8) |
Aug
(3) |
Sep
(5) |
Oct
(15) |
Nov
(25) |
Dec
(14) |
| 2005 |
Jan
(11) |
Feb
(5) |
Mar
(8) |
Apr
(5) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
(1) |
Nov
(3) |
Dec
|
| 2006 |
Jan
(2) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(2) |
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <gat...@li...> - 2003-09-16 13:25:00
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv26319
Modified Files:
km.c
Log Message:
Merge Marcynek's patch.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- km.c 22 Aug 2003 00:15:47 -0000 1.85
+++ km.c 16 Sep 2003 13:24:54 -0000 1.86
@@ -708,6 +708,10 @@
#define PCI_DEVICE_ID_ATI_RADEON_BB 0x4242
#endif
+#ifndef PCI_DEVICE_ID_ATI_RADEON_IF
+#define PCI_DEVICE_ID_ATI_RADEON_IF 0x4966
+#endif
+
#ifndef PCI_DEVICE_ID_ATI_RADEON_QD
#define PCI_DEVICE_ID_ATI_RADEON_QD 0x5144
#endif
@@ -911,6 +915,8 @@
/* Radeon200 i.e. 8500 */
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_BB,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
+ {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_IF,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{0,}
};
|
|
From: <gat...@li...> - 2003-08-22 00:15:50
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv19292
Modified Files:
km.c
Log Message:
Merge patch from Peter Osterlund.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- km.c 12 Jun 2003 19:24:10 -0000 1.84
+++ km.c 22 Aug 2003 00:15:47 -0000 1.85
@@ -732,6 +732,30 @@
#define PCI_DEVICE_ID_ATI_RADEON_QW 0x5157
#endif
+#ifndef PCI_DEVICE_ID_ATI_RADEON_N1
+#define PCI_DEVICE_ID_ATI_RADEON_N1 0x5159
+#endif
+
+#ifndef PCI_DEVICE_ID_ATI_RADEON_N2
+#define PCI_DEVICE_ID_ATI_RADEON_N2 0x515a
+#endif
+
+#ifndef PCI_DEVICE_ID_ATI_RADEON_RA
+#define PCI_DEVICE_ID_ATI_RADEON_RA 0x5144
+#endif
+
+#ifndef PCI_DEVICE_ID_ATI_RADEON_RB
+#define PCI_DEVICE_ID_ATI_RADEON_RB 0x5145
+#endif
+
+#ifndef PCI_DEVICE_ID_ATI_RADEON_RC
+#define PCI_DEVICE_ID_ATI_RADEON_RC 0x5146
+#endif
+
+#ifndef PCI_DEVICE_ID_ATI_RADEON_RD
+#define PCI_DEVICE_ID_ATI_RADEON_RD 0x5147
+#endif
+
static struct pci_device_id km_pci_tbl[] __devinitdata = {
/* mach64 cards */
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_215GB,
|
|
From: <gat...@li...> - 2003-08-13 15:06:45
|
Update of /cvsroot/gatos/ati_remote In directory sc8-pr-cvs1:/tmp/cvs-serv8952 Modified Files: README_LIRC Removed Files: lirc_usb.c Log Message: LIRC driver is now in LIRC-CVS repository. Index: README_LIRC =================================================================== RCS file: /cvsroot/gatos/ati_remote/README_LIRC,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README_LIRC 19 Feb 2003 02:19:18 -0000 1.1 +++ README_LIRC 13 Aug 2003 15:05:03 -0000 1.2 @@ -1,29 +1,10 @@ -lirc_usb.c: - -The LIRC driver is a hack between the GATOS ATI remote driver and another -LIRC usb driver. Currently, it creates a device file (/dev/usb/remote0) -and LIRC must be told to access that device via command line. I've tested -it with LIRC version 0.6.6 successfully. - -This driver is a temporary solution. I am working towards a LIRC driver -that uses their new driver interface (lirc_dev) and will eventually be -included with LIRC, not GATOS. - -Anyhow, to install it: - -Since I haven't messed with GNU's build tools, this is very half-assed... - -1) Download LIRC source and run ./autogen.sh; ./configure -2) Copy the lirc_usb.c source over another driver's source -3) Run make in that driver's source directory -4) Rename driver to lirc_usb.o -5) Copy to /lib/modules/(kernel version)/misc -6) Run depmod -a -7) Run insmod lirc_usb debug=1 -8) Run lircd -d /dev/usb/remote0 +The LIRC driver has now been integrated into LIRC-CVS (7.x). Please download +the latest version of LIRC. -Good luck! +Be sure to run irrecord to generate a new configuration file. The X10 remotes +support 16 channels, thus there are 16 possible codes for each button. The +sample configuration only contains codes for one remote channel. Paul Miller <pmi...@us...> --- lirc_usb.c DELETED --- |
|
From: <gat...@li...> - 2003-07-19 05:20:52
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv27177
Modified Files:
avview.scp
Log Message:
Get rid of commented out code.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- avview.scp 19 Jul 2003 04:11:29 -0000 1.139
+++ avview.scp 19 Jul 2003 05:20:46 -0000 1.140
@@ -171,14 +171,6 @@
global current_port_menu
global current_encoding_menu
-#eval label $c.portl -text "\"Port: \"" [get_settings $c.portl AVview]
-#set current_port_menu [tk_optionMenu $c.port_optionmenu current_port none]
-#eval $c.port_optionmenu configure [get_settings $c.port_optionmenu AVview]
-#eval $current_port_menu configure [get_settings $current_port_menu AVview menu]
-#$current_port_menu delete 0 end
-#grid $c.portl $c.port_optionmenu -sticky news
-#grid configure $c.portl -sticky nws
-
eval label $c.encodingl -text {{Encoding: }} [get_settings $c.encodingl AVview]
set current_encoding_menu [tk_optionMenu $c.encoding_optionmenu current_encoding_name none]
eval $c.encoding_optionmenu configure [get_settings $c.encoding_optionmenu AVview]
@@ -187,17 +179,6 @@
grid $c.encodingl $c.encoding_optionmenu -sticky news
grid configure $c.encodingl -sticky nws
-#eval label $c.tablel -text "\"Channel table: \"" [get_settings $c.tablel AVview]
-#set current_table_menu [tk_optionMenu $c.table_optionmenu current_table_name none]
-#eval $c.table_optionmenu configure [get_settings $c.table_optionmenu AVview]
-#eval $current_table_menu configure [get_settings $current_table_menu AVview menu]
-#$current_table_menu delete 0 end
-#foreach table $TABLE_LIST {
-# $current_table_menu add radiobutton -label "$table" -value "$table" -variable current_table_name
-# }
-#grid $c.tablel $c.table_optionmenu -sticky news
-#grid configure $c.tablel -sticky nws
-
eval label $c.channell -text {{Channel: }} [get_settings $c.channell]
set current_channel_menu [tk_optionMenu $c.channel_optionmenu current_channel none]
eval $c.channel_optionmenu configure [get_settings $c.channel_optionmenu AVview]
@@ -216,35 +197,6 @@
eval button $c.setup_window -text {{Setup window}} -command create_setup_window
grid $c.setup_window -row 1 -column 2 -padx 2 -pady 2
-#eval checkbutton $c.fullscreen_checkbutton -text "Fullscreen" \
-# -indicatoron false -variable fullscreen_mode [get_settings $c.fullscreen_checkbutton]
-#eval button $c.half_size_button -text \"Half size\" -command "make_half_size" [get_settings $c.half_size_button]
-
-#eval menubutton $c.interface_menubutton -text "Interface" -relief raised -menu $c.interface_menubutton.menu [get_settings $c.interface_menubutton]
-#eval menu $c.interface_menubutton.menu [get_settings $c.interface_menubutton.menu AVview]
-#$c.interface_menubutton.menu add checkbutton -label "Show main control window" -variable show_control_window
-#$c.interface_menubutton.menu add checkbutton -label "Attributes" -variable attributes_window
-#$c.interface_menubutton.menu add checkbutton -label "Capture (V4L)" -variable capture_window
-#if { [alsa_present] == "yes" } {
-# $c.interface_menubutton.menu add checkbutton -label "Audio mixer (ALSA)" -variable alsa_window
-# }
-#$c.interface_menubutton.menu add separator
-#$c.interface_menubutton.menu add command -label "Favorite channel editor" -command scan_channels
-#eval menu $c.interface_menubutton.menu.theme [get_settings $c.interface_menubutton.menu.theme AVview]
-#$c.interface_menubutton.menu add cascade -menu $c.interface_menubutton.menu.theme -label "Theme"
-#$c.interface_menubutton.menu add separator
-#$c.interface_menubutton.menu add command -label "Exit" -command {
-# ffmpeg_stop_encoding
-# save_settings
-# exit
-# }
-
-#grid $c.fullscreen_checkbutton $c.half_size_button $c.interface_menubutton -padx 5 -pady 5 -sticky ns
-
-# pack $c -expand yes -fill both
-# pack .controlwin.allattributes -expand yes -fill both -pady 5
-# pack .controlwin.capture -after .controlwin.allattributes -expand yes -fill both -pady 5 -side right
-
grid $c - - -sticky nw
grid .controlwin.allattributes -column 0 -row 1 -rowspan 2 -sticky news -pady 2
grid .controlwin.capture -column 1 -row 1 -rowspan 1 -sticky new -pady 2
@@ -310,22 +262,6 @@
}
set_hiding_cursor .video left_ptr
-
-#set NUM_ADAPTORS [xv_numadaptors $VIDEO_WINDOW]
-#puts "NUM_ADAPTORS=$NUM_ADAPTORS"
-
-#for { set i 0 } { $i < $NUM_ADAPTORS } { incr i 1 } {
-# puts "Adaptor $i: [xv_adaptor_name $VIDEO_WINDOW $i]"
-# puts "\t\ttype [xv_adaptor_type $VIDEO_WINDOW $i]"
-# puts "\t\tports [xv_adaptor_ports $VIDEO_WINDOW $i]"
-# if { ([lsearch -exact [xv_adaptor_type $VIDEO_WINDOW $i] input] != -1) } {
-# set adaptor_name "[xv_adaptor_name $VIDEO_WINDOW $i]"
-# foreach port [xv_adaptor_ports $VIDEO_WINDOW $i] {
-# puts "$port $adaptor_name"
-# $current_port_menu add radiobutton -label "$adaptor_name: $port" -value "$port" -variable current_port
-# }
-# }
-# }
proc set_channel_table {name1 name2 op} {
global TABLE_LIST
|
|
From: <gat...@li...> - 2003-07-19 04:11:32
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv20853
Modified Files:
avview.scp ffmpeg.scp setup.scp video_device.scp xv.scp
Log Message:
Cleanup.
Gather configuration settings into one category in the setup window.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- avview.scp 11 Jun 2003 21:33:12 -0000 1.138
+++ avview.scp 19 Jul 2003 04:11:29 -0000 1.139
@@ -899,7 +899,7 @@
}
if { [alsa_present] } {
- add_parameter_pane "/User interface settings" "User interface settings" \
+ add_parameter_pane "/Configuration/User interface settings" "User interface settings" \
"Display setup window on startup" checkbutton display_setup_window_on_startup \
"Display control window" checkbutton show_control_window \
"Display attributes subsection" checkbutton attributes_window \
@@ -909,7 +909,7 @@
"On screen message stays visible for as long as (secs)" choice { message_visible_secs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 } \
"Warn about missing km" checkbutton warn_about_missing_km
} {
- add_parameter_pane "/User interface settings" "User interface settings" \
+ add_parameter_pane "/Configuration/User interface settings" "User interface settings" \
"Display setup window on startup" checkbutton display_setup_window_on_startup \
"Display control window" checkbutton show_control_window \
"Display attributes subsection" checkbutton attributes_window \
@@ -919,15 +919,16 @@
"Warn about missing km" checkbutton warn_about_missing_km
}
-add_parameter_pane "/User interface settings/Fullscreen behaviour" "Fullscreen behaviour" \
+add_parameter_pane "/Configuration/User interface settings/Fullscreen behaviour" "Fullscreen behaviour" \
"Remember fullscreen state for new sessions" checkbutton remember_fullscreen_state \
"Always start fullscreen" checkbutton always_start_fullscreen \
"Disable fullscreen switching" checkbutton disable_fullscreen_switching \
"Remote power off button turns off monitor in fullscreen mode" checkbutton dpms_off_on_fullscreen_power_off
-Tree:open .setup.tree "/User interface settings"
+Tree:open .setup.tree "/Configuration"
+Tree:open .setup.tree "/Configuration/User interface settings"
-replace_parameter_choices "/Video device parameters" 0 a
+replace_parameter_choices "/Configuration/Video device parameters" 0 a
regenerate_port_menu
after idle {
Index: ffmpeg.scp
===================================================================
RCS file: /cvsroot/gatos/avview/ffmpeg.scp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ffmpeg.scp 2 Mar 2003 08:08:36 -0000 1.5
+++ ffmpeg.scp 19 Jul 2003 04:11:29 -0000 1.6
@@ -1,7 +1,7 @@
#!./avview_shell
if { [ffmpeg_present] } {
- add_parameter_pane "/Compression parameters" "Compression parameters" \
+ add_parameter_pane "/Configuration/Compression parameters" "Compression parameters" \
"Video codec parameters" heading "" \
"Bitrate control" choice { ffmpeg_video_bitrate_control "Fix bitrate" "Fix quality" } \
"Bitrate" entry ffmpeg_video_bitrate \
@@ -17,5 +17,5 @@
# "Record in chunks of (MB)" entry ffmpeg_recording_chunk_size
} {
- add_description_pane "/Compression parameters" "Compression parameters" "AVview has not been compiled to include compression library"
+ add_description_pane "/Configuration/Compression parameters" "Compression parameters" "AVview has not been compiled to include compression library"
}
Index: setup.scp
===================================================================
RCS file: /cvsroot/gatos/avview/setup.scp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- setup.scp 23 Feb 2003 19:37:12 -0000 1.13
+++ setup.scp 19 Jul 2003 04:11:29 -0000 1.14
@@ -91,6 +91,7 @@
global diag_pane_count
set PANE_FRAME $SETUP_MAIN.f.pane$diag_pane_count
frame $PANE_FRAME
+puts stderr "Adding pane $PANE_FRAME $key $title"
make_title $PANE_FRAME.title "$title"
grid $PANE_FRAME.title -sticky news -pady 2
frame $PANE_FRAME.f
@@ -118,19 +119,10 @@
Tree:newitem $SETUP_MAIN.tree $key -tags "KEY_$key"
-set SETUP_PANES($key:pane_frame) "$PANE_FRAME"
+set SETUP_PANES($key:pane_frame) $PANE_FRAME
incr diag_pane_count
}
-proc get_pane_frame { key } {
-global SETUP_PANES
-set frame ""
-catch {
- set frame [set SETUP_PANES($key:pane_frame)]
- }
-return $frame
-}
-
proc set_next_key { key next_key } {
global SETUP_PANES
set SETUP_PANES($key:next_key) "$next_key"
@@ -322,3 +314,5 @@
wm protocol .setup WM_DELETE_WINDOW {
wm withdraw .setup
}
+
+add_parameter_pane "/Configuration" "Configuration"
Index: video_device.scp
===================================================================
RCS file: /cvsroot/gatos/avview/video_device.scp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- video_device.scp 25 Aug 2002 15:28:05 -0000 1.5
+++ video_device.scp 19 Jul 2003 04:11:29 -0000 1.6
@@ -1,6 +1,6 @@
#!./avview_shell
-add_parameter_pane "/Video device parameters" "Video device parameters" \
+add_parameter_pane "/Configuration/Video device parameters" "Video device parameters" \
"Xv port used for on-screen display" choice {current_port } \
"Xv port encoding" choice {current_encoding } \
"Channel table" choice [linsert $TABLE_LIST 0 current_table_name] \
@@ -9,7 +9,7 @@
proc regenerate_port_menu {} {
global VIDEO_WINDOW
-set vd_param [get_pane_frame "/Video device parameters"]
+set vd_param [get_pane_frame "/Configuration/Video device parameters"]
set menu [$vd_param.f.canvas.f.optionmenu0 cget -menu]
set NUM_ADAPTORS [xv_numadaptors $VIDEO_WINDOW]
puts "NUM_ADAPTORS=$NUM_ADAPTORS"
Index: xv.scp
===================================================================
RCS file: /cvsroot/gatos/avview/xv.scp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- xv.scp 13 Mar 2003 18:59:48 -0000 1.20
+++ xv.scp 19 Jul 2003 04:11:29 -0000 1.21
@@ -276,7 +276,7 @@
set NUM_ENCODINGS [xv_num_port_encodings $VIDEO_WINDOW $current_port]
-set vd_param [get_pane_frame "/Video device parameters"]
+set vd_param [get_pane_frame "/Configuration/Video device parameters"]
set vdp_encoding_menu [$vd_param.f.canvas.f.optionmenu1 cget -menu]
$current_encoding_menu delete 0 end
|
|
From: <gat...@li...> - 2003-07-18 20:16:15
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv15749 Modified Files: acsite.m4 configure.in Log Message: Fix misprint in configure message. Get Tcl/Tk detection to work with Debian and Slackware default installs. (Awaits more testing). Index: acsite.m4 =================================================================== RCS file: /cvsroot/gatos/avview/acsite.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- acsite.m4 5 Sep 2002 23:26:06 -0000 1.2 +++ acsite.m4 18 Jul 2003 20:16:12 -0000 1.3 @@ -62,6 +62,7 @@ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib/tcl* 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then ac_cv_c_tclconfig=`(cd $i; pwd)` @@ -157,6 +158,7 @@ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib/tk* 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then ac_cv_c_tkconfig=`(cd $i; pwd)` Index: configure.in =================================================================== RCS file: /cvsroot/gatos/avview/configure.in,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- configure.in 1 Jul 2003 21:45:38 -0000 1.52 +++ configure.in 18 Jul 2003 20:16:12 -0000 1.53 @@ -46,7 +46,7 @@ AC_CHECK_LIB([zvbi], [vbi_capture_v4l_new]) AC_CHECK_LIB([asound], [snd_card_get_name]) -echo "The libraries mp3lamd, ogg, vorbis, vorbisenc might be required by ffmpeg" +echo "The libraries mp3lame, ogg, vorbis and vorbisenc might be required by ffmpeg" AC_CHECK_LIB([mp3lame], [lame_encode_buffer]) AC_CHECK_LIB([ogg], [oggpack_write]) AC_CHECK_LIB([vorbis], [vorbis_book_init_encode]) |
|
From: <gat...@li...> - 2003-07-17 07:01:11
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv9711
Modified Files:
alsa.c ffmpeg.c
Log Message:
Apply patch from Randy Pearson.
Index: alsa.c
===================================================================
RCS file: /cvsroot/gatos/avview/alsa.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- alsa.c 24 Mar 2003 06:22:23 -0000 1.34
+++ alsa.c 17 Jul 2003 07:01:04 -0000 1.35
@@ -537,10 +537,15 @@
return -1;
}
fprintf(stderr,"Checkpoint 2.2.1.1\n");
-if((a=snd_pcm_open(&(ad->recording_handle), arg_audio_device, SND_PCM_STREAM_CAPTURE, 0))<0){
+if((a=snd_pcm_open(&(ad->recording_handle), arg_audio_device, SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK))<0){
fprintf(stderr,"Error opening device %s for capture %s\n", arg_audio_device, snd_strerror(a));
return -1;
}
+if((a=snd_pcm_nonblock(ad->recording_handle, 0))<0){
+ fprintf(stderr,"Error switching audio device %s to nonblocking mode %s\n", arg_audio_device, snd_strerror(a));
+ return -1;
+ }
+fprintf(stderr,"Checkpoint 2.2.1.1.1\n");
fprintf(stderr,"Checkpoint 2.2.1.2\n");
if((a=snd_pcm_hw_params_any(ad->recording_handle, hwparams))<0){
fprintf(stderr,"Error device %s has no configurations available: %s\n", arg_audio_device, snd_strerror(a));
Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/gatos/avview/ffmpeg.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ffmpeg.c 17 Jul 2003 06:21:00 -0000 1.79
+++ ffmpeg.c 17 Jul 2003 07:01:05 -0000 1.80
@@ -84,7 +84,7 @@
FFMPEG_ENCODING_DATA *sdata=NULL;
-/* #define DEBUG_TIMESTAMPS */
+/* #define DEBUG_TIMESTAMPS */
/* make pts (90KHz clock) from timestamps */
static int make_pts(int64 start, int64 now)
@@ -794,7 +794,7 @@
}
}
sdata->video_s->stop_stream &= ~STOP_CONSUMER_THREAD;
-return 0;
+return TCL_OK;
}
int ffmpeg_switch_file(ClientData client_data,Tcl_Interp* interp,int argc,const char *argv[])
|
|
From: <gat...@li...> - 2003-07-17 06:21:04
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv3873
Modified Files:
ffmpeg.c
Log Message:
Check that ffmpeg library was compiled in ok.
Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/gatos/avview/ffmpeg.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- ffmpeg.c 1 Jul 2003 16:54:52 -0000 1.78
+++ ffmpeg.c 17 Jul 2003 06:21:00 -0000 1.79
@@ -1063,6 +1063,13 @@
#if USE_FFMPEG
av_register_all();
avcodec_register_all();
+if((LIBAVCODEC_VERSION_INT!=avcodec_version())||(LIBAVFORMAT_VERSION_INT!=LIBAVCODEC_VERSION_INT)){
+ fprintf(stderr, "Detected mismatch between ffmpeg library headers and/or binaries. This error can only occur if somehow avview compilation used headers and/or binaries from different version of ffmpeg.\n");
+ fprintf(stderr,"avcodec.h version:0x%06x\n", LIBAVCODEC_VERSION_INT);
+ fprintf(stderr,"avformat.h version:0x%06x\n", LIBAVFORMAT_VERSION_INT);
+ fprintf(stderr,"libavcodec version:0x%06x\n", avcodec_version());
+ exit(-1);
+ }
#endif
for(i=0;ffmpeg_commands[i].name!=NULL;i++)
|
|
From: <gat...@li...> - 2003-07-01 21:45:42
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv11444 Modified Files: configure.in Log Message: Add checks for multimedia libraries that could be used by ffmpeg. Index: configure.in =================================================================== RCS file: /cvsroot/gatos/avview/configure.in,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- configure.in 7 Jun 2003 07:19:00 -0000 1.51 +++ configure.in 1 Jul 2003 21:45:38 -0000 1.52 @@ -46,6 +46,12 @@ AC_CHECK_LIB([zvbi], [vbi_capture_v4l_new]) AC_CHECK_LIB([asound], [snd_card_get_name]) +echo "The libraries mp3lamd, ogg, vorbis, vorbisenc might be required by ffmpeg" +AC_CHECK_LIB([mp3lame], [lame_encode_buffer]) +AC_CHECK_LIB([ogg], [oggpack_write]) +AC_CHECK_LIB([vorbis], [vorbis_book_init_encode]) +AC_CHECK_LIB([vorbisenc], [vorbis_encode_init]) + # # # Default values |
|
From: <gat...@li...> - 2003-07-01 16:55:00
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv18967 Modified Files: ffmpeg.c Log Message: Do not use motion_estimation_method variable with CVS ffmpeg. Index: ffmpeg.c =================================================================== RCS file: /cvsroot/gatos/avview/ffmpeg.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- ffmpeg.c 30 Jun 2003 13:25:53 -0000 1.77 +++ ffmpeg.c 1 Jul 2003 16:54:52 -0000 1.78 @@ -703,7 +703,11 @@ sdata=NULL; return TCL_OK; } +#ifdef FRAME_RATE_BASE +/* ffmpeg 0.4.6 */ motion_estimation_method=ME_FULL; +#endif + memset(&(sdata->format_context), 0, sizeof(AVFormatContext)); sdata->format_context.nb_streams=0; |
|
From: <gat...@li...> - 2003-06-30 18:59:59
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv17788
Modified Files:
radeon_video.c
Log Message:
Disable VBI capture support for anything but NTSC Tuner.
Index: radeon_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/radeon_video.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- radeon_video.c 14 Jun 2003 16:54:35 -0000 1.93
+++ radeon_video.c 30 Jun 2003 18:59:55 -0000 1.94
@@ -1773,12 +1773,13 @@
pPriv->mute = TRUE;
pPriv->v = 0;
pPriv->overlay_deinterlacing_method = METHOD_BOB;
- pPriv->capture_vbi_data = 1;
+ pPriv->capture_vbi_data = 0;
pPriv->dec_brightness = 0;
pPriv->dec_saturation = 0;
pPriv->dec_contrast = 0;
pPriv->dec_hue = 0;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBI data capture is only supported for NTSC Tuner at the moment\n");
/*
* Unlike older Mach64 chips, RADEON has only two ECP settings:
@@ -3193,6 +3194,10 @@
pPriv->fi1236->parm.band_high = 0x33;
}
}
+
+ /* Disable VBI capture for anything but TV tuner */
+ if(pPriv->encoding==5)pPriv->capture_vbi_data=1;
+ else pPriv->capture_vbi_data=0;
}
void RADEON_RT_SetEncoding(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
|
|
From: <gat...@li...> - 2003-06-30 13:25:56
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv25218 Modified Files: ffmpeg.c Log Message: Incorporate patch from Ross Coleman allowing avview to compile with ffmpeg later than 0.4.6 (i.e. current CVS). Index: ffmpeg.c =================================================================== RCS file: /cvsroot/gatos/avview/ffmpeg.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- ffmpeg.c 2 Mar 2003 08:08:35 -0000 1.76 +++ ffmpeg.c 30 Jun 2003 13:25:53 -0000 1.77 @@ -527,15 +527,28 @@ sdata->video_codec_context.height=data->vwin.height; break; } + +#ifdef FRAME_RATE_BASE + /* ffmpeg 0.4.6 */ + #define FFMPEG_FRAME_RATE_BASE FRAME_RATE_BASE +#else +#ifdef DEFAULT_FRAME_RATE_BASE + /* ffmpeg from current CVS */ + #define FFMPEG_FRAME_RATE_BASE DEFAULT_FRAME_RATE_BASE +#else + #error "FRAME_RATE_BASE is not defined" +#endif +#endif + sdata->video_codec_context.frame_rate=0; -if(arg_v4l_rate!=NULL)sdata->video_codec_context.frame_rate=rint(atof(arg_v4l_rate)*FRAME_RATE_BASE); -if(sdata->video_codec_context.frame_rate<=0)sdata->video_codec_context.frame_rate=60*FRAME_RATE_BASE; +if(arg_v4l_rate!=NULL)sdata->video_codec_context.frame_rate=rint(atof(arg_v4l_rate)*FFMPEG_FRAME_RATE_BASE); +if(sdata->video_codec_context.frame_rate<=0)sdata->video_codec_context.frame_rate=60*FFMPEG_FRAME_RATE_BASE; if(data->step_frames>0)sdata->video_codec_context.frame_rate=sdata->video_codec_context.frame_rate/data->step_frames; a=(((800000.0*data->vwin.width)*data->vwin.height)*sdata->video_codec_context.frame_rate); -b=(352.0*288.0*25.0*FRAME_RATE_BASE); +b=(352.0*288.0*25.0*FFMPEG_FRAME_RATE_BASE); sdata->video_codec_context.bit_rate=0; if(arg_video_bitrate!=NULL)sdata->video_codec_context.bit_rate=atol(arg_video_bitrate); -if(sdata->video_codec_context.bit_rate< (sdata->video_codec_context.frame_rate/FRAME_RATE_BASE+1)) +if(sdata->video_codec_context.bit_rate< (sdata->video_codec_context.frame_rate/FFMPEG_FRAME_RATE_BASE+1)) sdata->video_codec_context.bit_rate=rint(a/b); fprintf(stderr,"video: using bitrate=%d, frame_rate=%d\n", sdata->video_codec_context.bit_rate, sdata->video_codec_context.frame_rate); sdata->video_codec_context.pix_fmt=PIX_FMT_YUV420P; @@ -550,7 +563,7 @@ sdata->video_codec_context.max_qdiff=3; sdata->video_codec_context.aspect_ratio=FF_ASPECT_4_3_625; -sdata->video_codec_context.me_method=4; +sdata->video_codec_context.me_method=ME_FULL; sdata->video_codec_context.qblur=0.5; sdata->video_codec_context.qcompress=0.5; sdata->video_codec_context.b_quant_factor=1.25; |
|
From: <gat...@li...> - 2003-06-14 16:54:38
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv25643
Modified Files:
radeon_video.c
Log Message:
Fix compilation again.
Index: radeon_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/radeon_video.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- radeon_video.c 24 May 2003 04:37:15 -0000 1.92
+++ radeon_video.c 14 Jun 2003 16:54:35 -0000 1.93
@@ -3123,8 +3123,11 @@
){
int size, tmp;
+#if 0
/* Overlay scaler has buffer that is pPriv->overlay_scaler_buffer_width pixels wide */
if(*w > pPriv->overlay_scaler_buffer_width) *w = pPriv->overlay_scaler_buffer_width;
+#endif
+ if(*w > 2048) *w = 2048;
if(*h > 2048) *h = 2048;
*w = (*w + 1) & ~1;
|
|
From: <gat...@li...> - 2003-06-12 19:24:14
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv23081
Modified Files:
km.c
Log Message:
QL->QM.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- km.c 11 Jun 2003 21:43:01 -0000 1.83
+++ km.c 12 Jun 2003 19:24:10 -0000 1.84
@@ -720,8 +720,8 @@
#define PCI_DEVICE_ID_ATI_RADEON_QG 0x5147
#endif
-#ifndef PCI_DEVICE_ID_ATI_RADEON_QL
-#define PCI_DEVICE_ID_ATI_RADEON_QL 0x514b
+#ifndef PCI_DEVICE_ID_ATI_RADEON_QM
+#define PCI_DEVICE_ID_ATI_RADEON_QM 0x514c
#endif
#ifndef PCI_DEVICE_ID_ATI_RADEON_QN
@@ -872,7 +872,7 @@
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QG,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
- {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QL,
+ {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QM,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QN,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
|
|
From: <gat...@li...> - 2003-06-11 21:43:04
|
Update of /cvsroot/gatos/km
In directory sc8-pr-cvs1:/tmp/cvs-serv1263
Modified Files:
km.c
Log Message:
Add Radeon QL to the list of supported cards.
Index: km.c
===================================================================
RCS file: /cvsroot/gatos/km/km.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- km.c 4 May 2003 20:24:53 -0000 1.82
+++ km.c 11 Jun 2003 21:43:01 -0000 1.83
@@ -720,6 +720,10 @@
#define PCI_DEVICE_ID_ATI_RADEON_QG 0x5147
#endif
+#ifndef PCI_DEVICE_ID_ATI_RADEON_QL
+#define PCI_DEVICE_ID_ATI_RADEON_QL 0x514b
+#endif
+
#ifndef PCI_DEVICE_ID_ATI_RADEON_QN
#define PCI_DEVICE_ID_ATI_RADEON_QN 0x514d
#endif
@@ -867,6 +871,8 @@
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QF,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QG,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
+ {PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
{PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RADEON_QN,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, HARDWARE_RADEON},
|
|
From: <gat...@li...> - 2003-06-11 21:33:16
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv29113
Modified Files:
avview.scp
Log Message:
Do not grab mouse pointer in fullscreen with xinerama.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- avview.scp 11 Jun 2003 17:42:39 -0000 1.137
+++ avview.scp 11 Jun 2003 21:33:12 -0000 1.138
@@ -627,7 +627,9 @@
$VIDEO_WINDOW configure -width $width \
-height $height
wm geometry . =$geometry
- grab -global .
+ if { ! [xmisc_xinerama_active $VIDEO_WINDOW] } {
+ grab -global .
+ }
focus -force .
# }
} {
@@ -653,7 +655,9 @@
update
update idletasks
wm geometry . =$saved_main_window_geometry
- grab release .
+ if { ! [xmisc_xinerama_active $VIDEO_WINDOW] } {
+ grab release .
+ }
focus -force .
}
set in_set_fullscreen false
|
|
From: <gat...@li...> - 2003-06-11 17:42:43
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv19360
Modified Files:
avview.scp
Log Message:
Preliminary xinerama support.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- avview.scp 7 Jun 2003 07:19:00 -0000 1.136
+++ avview.scp 11 Jun 2003 17:42:39 -0000 1.137
@@ -585,26 +585,34 @@
update
update idletasks
}
- set screen_width [winfo screenwidth $VIDEO_WINDOW]
- set screen_height [winfo screenheight $VIDEO_WINDOW]
if { [xmisc_xinerama_active $VIDEO_WINDOW] } {
puts stderr "Xinerama is active"
- puts stderr "Xinerama info: [xmisc_xinerama_query_screens $VIDEO_WINDOW]"
+ set xinerama_info [xmisc_xinerama_query_screens $VIDEO_WINDOW]
+ puts stderr "Xinerama info: $xinerama_info"
+ puts stderr "Buggy - assuming adaptor is on screen [lindex $xinerama_info 1]"
+ set coords [lindex $xinerama_info 3]
+ set width [lindex $coords 2]
+ set height [lindex $coords 3]
+ set geometry ${width}x${height}+[lindex $coords 0]+[lindex $coords 1]
+ } {
+ set width [winfo screenwidth $VIDEO_WINDOW]
+ set height [winfo screenheight $VIDEO_WINDOW]
+ set geometry ${width}x$height+0+0
}
- wm geometry . =${screen_width}x${screen_height}+0+0
+ wm geometry . =$geometry
place $VIDEO_WINDOW.onscreen_display -relx 0.05 -rely 0.05 -anchor nw
update
update idletasks
# xmisc_setfullscreen .
- wm geometry . =${screen_width}x${screen_height}+0+0
+ wm geometry . =$geometry
# . configure -width $screen_width \
# -height $screen_height -background red
- $VIDEO_WINDOW configure -width ${screen_width} \
- -height ${screen_height}
+ $VIDEO_WINDOW configure -width $width \
+ -height $height
display_video
update
# puts "1. state=[wm state .]"
@@ -616,9 +624,9 @@
update idletasks
}
# puts "3. state=[wm state .] mapped=[winfo ismapped .]"
- $VIDEO_WINDOW configure -width ${screen_width} \
- -height ${screen_height}
- wm geometry . =${screen_width}x${screen_height}+0+0
+ $VIDEO_WINDOW configure -width $width \
+ -height $height
+ wm geometry . =$geometry
grab -global .
focus -force .
# }
|
|
From: <gat...@li...> - 2003-06-08 05:20:05
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv20205
Modified Files:
xmisc.c
Log Message:
Fix misprint.
Index: xmisc.c
===================================================================
RCS file: /cvsroot/gatos/avview/xmisc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- xmisc.c 7 Jun 2003 07:19:00 -0000 1.12
+++ xmisc.c 8 Jun 2003 05:20:01 -0000 1.13
@@ -504,12 +504,12 @@
Tcl_AppendResult(interp,"ERROR: xmisc_xinerama_query_screens: could not obtain screen info", NULL);
return TCL_ERROR;
}
-ans=Tcl_NewListObj(interp, NULL);
+ans=Tcl_NewListObj(0, NULL);
for(i=0;i<num;i++){
Tcl_ListObjAppendElement(interp, ans, Tcl_NewStringObj("screen",-1));
Tcl_ListObjAppendElement(interp, ans, Tcl_NewIntObj(xsi[i].screen_number));
Tcl_ListObjAppendElement(interp, ans, Tcl_NewStringObj("coords",-1));
- l=Tcl_NewListObj(interp, NULL);
+ l=Tcl_NewListObj(0, NULL);
Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].x_org));
Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].y_org));
Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].width));
|
|
From: <gat...@li...> - 2003-06-07 07:19:03
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv13477
Modified Files:
avview.scp configure.in xmisc.c
Log Message:
Initial support for xinerama.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- avview.scp 16 May 2003 03:58:51 -0000 1.135
+++ avview.scp 7 Jun 2003 07:19:00 -0000 1.136
@@ -587,6 +587,11 @@
}
set screen_width [winfo screenwidth $VIDEO_WINDOW]
set screen_height [winfo screenheight $VIDEO_WINDOW]
+
+ if { [xmisc_xinerama_active $VIDEO_WINDOW] } {
+ puts stderr "Xinerama is active"
+ puts stderr "Xinerama info: [xmisc_xinerama_query_screens $VIDEO_WINDOW]"
+ }
wm geometry . =${screen_width}x${screen_height}+0+0
place $VIDEO_WINDOW.onscreen_display -relx 0.05 -rely 0.05 -anchor nw
Index: configure.in
===================================================================
RCS file: /cvsroot/gatos/avview/configure.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- configure.in 24 Mar 2003 06:32:32 -0000 1.50
+++ configure.in 7 Jun 2003 07:19:00 -0000 1.51
@@ -4,7 +4,7 @@
# Note to self: always bump version number when there are changes
# in setup window or avview_shell
#
-AC_INIT([AVview], [0.11.12], [gat...@li...])
+AC_INIT([AVview], [0.12.5], [gat...@li...])
#
# For now I'll be happier without NEWS and Changelog files.
#
@@ -84,9 +84,24 @@
AC_CHECK_HEADER(libzvbi.h, , echo "Avview requires libzvbi 0.2.3 or later" ; exit )
+use_xinerama=0
+AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+ AC_DEFINE(USE_XINERAMA, 1, [Is Xinerama present])
+ use_xinerama=1 ,
+ AC_DEFINE(USE_XINERAMA, 0, [Is Xinerama present])
+ ,[
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ ])
+
+AC_SUBST(USE_XINERAMA)
+
AC_CHECK_LIB([X11], [XCreateSimpleWindow],,,[$X_LIBS])
AC_CHECK_LIB([Xext], [XInitExtension],,,[$X_LIBS])
AC_CHECK_LIB([Xv], [XvPutVideo],,,[$X_LIBS -lX11 -lXext])
+AC_CHECK_LIB([Xinerama], [XineramaIsActive],,,[$X_LIBS -lX11 -lXext])
+
+
A_CFLAGS="$CFLAGS"
Index: xmisc.c
===================================================================
RCS file: /cvsroot/gatos/avview/xmisc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xmisc.c 15 Feb 2003 01:20:00 -0000 1.11
+++ xmisc.c 7 Jun 2003 07:19:00 -0000 1.12
@@ -23,6 +23,11 @@
#include <X11/extensions/XShm.h>
#include <X11/extensions/dpms.h>
#include <X11/Xutil.h>
+
+#if USE_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+
#include <tcl.h>
#include <tk.h>
@@ -453,6 +458,79 @@
return TCL_OK;
}
+#if USE_XINERAMA
+int xmisc_xinerama_active(ClientData client_data,Tcl_Interp* interp,int argc,const char *argv[])
+{
+Tk_Window tkwin;
+
+Tcl_ResetResult(interp);
+
+if(argc<2){
+ Tcl_AppendResult(interp,"ERROR: xmisc_xinerama_active requires at least one argument", NULL);
+ return TCL_ERROR;
+ }
+tkwin=Tk_NameToWindow(interp,argv[1], Tk_MainWindow(interp));
+
+if(tkwin==NULL){
+ Tcl_AppendResult(interp,"ERROR: xmisc_xinerama_active: first argument must be an existing toplevel or frame window", NULL);
+ return TCL_ERROR;
+ }
+
+Tcl_SetObjResult(interp, Tcl_NewIntObj(XineramaIsActive(Tk_Display(tkwin))));
+return TCL_OK;
+}
+
+int xmisc_xinerama_query_screens(ClientData client_data,Tcl_Interp* interp,int argc,const char *argv[])
+{
+Tk_Window tkwin;
+Tcl_Obj *ans, *l;
+XineramaScreenInfo *xsi;
+int i,num;
+
+Tcl_ResetResult(interp);
+
+if(argc<2){
+ Tcl_AppendResult(interp,"ERROR: xmisc_xinerama_query_screens requires at least one argument", NULL);
+ return TCL_ERROR;
+ }
+tkwin=Tk_NameToWindow(interp,argv[1], Tk_MainWindow(interp));
+
+if(tkwin==NULL){
+ Tcl_AppendResult(interp,"ERROR: xmisc_xinerama_query_screens: first argument must be an existing toplevel or frame window", NULL);
+ return TCL_ERROR;
+ }
+xsi=XineramaQueryScreens(Tk_Display(tkwin), &num);
+if(xsi==NULL){
+ Tcl_AppendResult(interp,"ERROR: xmisc_xinerama_query_screens: could not obtain screen info", NULL);
+ return TCL_ERROR;
+ }
+ans=Tcl_NewListObj(interp, NULL);
+for(i=0;i<num;i++){
+ Tcl_ListObjAppendElement(interp, ans, Tcl_NewStringObj("screen",-1));
+ Tcl_ListObjAppendElement(interp, ans, Tcl_NewIntObj(xsi[i].screen_number));
+ Tcl_ListObjAppendElement(interp, ans, Tcl_NewStringObj("coords",-1));
+ l=Tcl_NewListObj(interp, NULL);
+ Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].x_org));
+ Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].y_org));
+ Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].width));
+ Tcl_ListObjAppendElement(interp, l, Tcl_NewIntObj(xsi[i].height));
+ Tcl_ListObjAppendElement(interp, ans, l);
+ }
+Tcl_SetObjResult(interp, ans);
+XFree(xsi);
+return TCL_OK;
+}
+#else
+int xmisc_xinerama_active(ClientData client_data,Tcl_Interp* interp,int argc,const char *argv[])
+{
+Tk_Window tkwin;
+
+Tcl_ResetResult(interp);
+Tcl_SetObjResult(interp, Tcl_NewIntObj(0));
+return TCL_OK;
+}
+#endif
+
struct {
char *name;
Tcl_CmdProc *command;
@@ -464,6 +542,10 @@
{"xmisc_seticon", xmisc_seticon},
{"xmisc_settextproperty", xmisc_settextproperty},
{"xmisc_querytree", xmisc_querytree},
+ {"xmisc_xinerama_active", xmisc_xinerama_active},
+ #if USE_XINERAMA
+ {"xmisc_xinerama_query_screens", xmisc_xinerama_query_screens},
+ #endif
{NULL, NULL}
};
|
|
From: <gat...@li...> - 2003-05-24 04:37:18
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv12462
Modified Files:
radeon_video.c
Log Message:
1536 can be 1920 for 8500, 9700 and 9600 Radeon chips.
Index: radeon_video.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/radeon_video.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- radeon_video.c 10 Mar 2003 00:33:35 -0000 1.91
+++ radeon_video.c 24 May 2003 04:37:15 -0000 1.92
@@ -148,6 +148,7 @@
Bool EEPROM_present;
int EEPROM_addr;
+ int overlay_scaler_buffer_width;
Bool addon_board;
CARD8 board_info;
@@ -1853,6 +1854,16 @@
RADEONInitI2C(pScrn,pPriv);
}
}
+ /* overlay scaler line length differs for different revisions
+ this needs to be maintained by hand */
+ switch(info->ChipFamily){
+ case CHIP_FAMILY_R200:
+ case CHIP_FAMILY_R300:
+ pPriv->overlay_scaler_buffer_width=1920;
+ break;
+ default:
+ pPriv->overlay_scaler_buffer_width=1536;
+ }
if((pPriv->theatre!=NULL) && !RADEONSetupTheatre(pScrn,pPriv,pPriv->theatre))
{
free(pPriv->theatre);
@@ -2676,7 +2687,7 @@
/* if the source width was larger than what would fit in overlay scaler increase step_by values */
i=src_w;
- while(i>1536){
+ while(i>pPriv->overlay_scaler_buffer_width){
step_by_y++;
step_by_uv++;
h_inc >>=1;
@@ -2701,13 +2712,13 @@
h_inc_uv = h_inc>>(step_by_uv-step_by_y);
h_inc = h_inc * h_inc_d;
h_inc_uv = h_inc_uv * h_inc_d;
- /* 1536 is magic number - maximum line length the overlay scaler can fit
+ /* pPriv->overlay_scaler_buffer_width is magic number - maximum line length the overlay scaler can fit
in the buffer for 2 tap filtering */
/* the only place it is documented in is in ATI source code */
/* we need twice as much space for 4 tap filtering.. */
/* under special circumstances turn on 4 tap filtering */
if(!is_rgb && (step_by_y==1) && (step_by_uv==1) && (h_inc < (1<<12)) && (deinterlacing_method!=METHOD_WEAVE)
- && (drw_w*2 <= 1536)){
+ && (drw_w*2 <= pPriv->overlay_scaler_buffer_width)){
step_by_y=0;
step_by_uv=1;
h_inc_uv = h_inc;
@@ -3112,8 +3123,8 @@
){
int size, tmp;
- /* Overlay scaler has buffer that is 1536 pixels wide */
- if(*w > 1536) *w = 1536;
+ /* Overlay scaler has buffer that is pPriv->overlay_scaler_buffer_width pixels wide */
+ if(*w > pPriv->overlay_scaler_buffer_width) *w = pPriv->overlay_scaler_buffer_width;
if(*h > 2048) *h = 2048;
*w = (*w + 1) & ~1;
|
|
From: <gat...@li...> - 2003-05-16 03:58:55
|
Update of /cvsroot/gatos/avview In directory sc8-pr-cvs1:/tmp/cvs-serv7592 Modified Files: avview.scp Log Message: Update right-click menu. Index: avview.scp =================================================================== RCS file: /cvsroot/gatos/avview/avview.scp,v retrieving revision 1.134 retrieving revision 1.135 diff -u -d -r1.134 -r1.135 --- avview.scp 15 May 2003 21:58:54 -0000 1.134 +++ avview.scp 16 May 2003 03:58:51 -0000 1.135 @@ -741,7 +741,7 @@ menu .video_menu.cc_menu -type normal -tearoff false .video_menu add command -label "Toggle mute" -command toggle_mute -.video_menu add command -label "Toggle mute and fullscreen" -command "toggle_mute ; toggle_fullscreen" +.video_menu add command -label "Toggle fullscreen" -command toggle_fullscreen .video_menu add cascade -menu .video_menu.channel_menu -label "Channel" .video_menu add cascade -menu .video_menu.connector_menu -label "Connector" .video_menu add cascade -menu .video_menu.cc_menu -label "Closed caption" |
|
From: <gat...@li...> - 2003-05-15 21:58:57
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv10780
Modified Files:
avview.scp
Log Message:
Make last importantant message visible in application title.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- avview.scp 12 May 2003 00:13:32 -0000 1.133
+++ avview.scp 15 May 2003 21:58:54 -0000 1.134
@@ -720,9 +720,10 @@
frame $m -background $bg
raise $m
grid $m
-label $m.l -text "$message" -font message_font -background black -foreground "#FFAA88"
+label $m.l -text $message -font message_font -background black -foreground "#FFAA88"
grid $m.l
+wm title . "AVview: $message"
global flash_counter message_visible_secs
if { $flash_counter < 0 } { after 1000 fm_countdown }
|
|
From: <gat...@li...> - 2003-05-12 00:13:34
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv27410
Modified Files:
avview.scp
Log Message:
Add long requested command line options to avview.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- avview.scp 11 May 2003 22:59:31 -0000 1.132
+++ avview.scp 12 May 2003 00:13:32 -0000 1.133
@@ -6,16 +6,26 @@
#
# avview preliminary version
#
-# (C) Vladimir Dergachev 2001-2002
+# (C) Vladimir Dergachev 2001-2003
#
# GNU Public License
#
-global control_screen
-set control_screen1 ""
-regexp "control=\[^ \]+" "$argv" control_screen1
-regsub "control=" "$control_screen1" "" control_screen
-puts "control_screen=$control_screen"
+proc print_help {} {
+puts stderr {
+Usage:
+ start_avview [options]
+
+Options:
+ --help print this message
+ --control-screen=display display control windows on specified
+ display
+ --screen-size=WxH start TV window with size WxH
+ --geometry=geometry specify TV window geometry, using
+ usual X11 notation
+
+}
+}
foreach {variable value} {
debug 0
@@ -49,11 +59,32 @@
message_visible_secs 14
save_settings_on_exit "unset"
warn_about_missing_km "true"
+ control_screen ""
+ startup_script ""
} {
global $variable
set $variable $value
}
+foreach option $argv {
+ switch -glob -- $option {
+ "--help" { print_help ; exit}
+ "--control-screen=*" {
+ regexp -- {--control-screen=([^ ]+)} $option {} control_screen
+ puts "control_screen=$control_screen"
+ }
+ "--screen-size=*" {
+ regexp -- {--screen-size=([0-9]+)x([0-9]+)} $option {} width height
+ append startup_script "set_video_window_size $width $height\n"
+ }
+ "--geometry=*" {
+ regexp -- {--geometry=(.+)} $option {} geometry
+ append startup_script "wm geometry . \"$geometry\"\n"
+ }
+ }
+ }
+
+
global TABLE_LIST
set TABLE_LIST [freq_get_table_list]
@@ -897,5 +928,7 @@
set fullscreen_mode true
}
xv_pick_defaults
+ global startup_script
+ eval $startup_script
}
-
+
|
|
From: <gat...@li...> - 2003-05-11 22:59:34
|
Update of /cvsroot/gatos/avview
In directory sc8-pr-cvs1:/tmp/cvs-serv4836
Modified Files:
avview.scp
Log Message:
Rearrange main menu a little.
Index: avview.scp
===================================================================
RCS file: /cvsroot/gatos/avview/avview.scp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- avview.scp 12 Apr 2003 04:17:31 -0000 1.131
+++ avview.scp 11 May 2003 22:59:31 -0000 1.132
@@ -621,6 +621,7 @@
if {$fullscreen_mode} {
set fullscreen_mode 0
+ after idle "set_video_window_size $w $h"
return
}
@@ -700,6 +701,7 @@
menu .video_menu -type normal -tearoff false
menu .video_menu.size_menu -type normal -tearoff false
+menu .video_menu.aspect_menu -type normal -tearoff false
menu .video_menu.channel_menu -type normal -tearoff false
menu .video_menu.connector_menu -type normal -tearoff false
menu .video_menu.interface_menu -type normal -tearoff false
@@ -712,6 +714,7 @@
.video_menu add cascade -menu .video_menu.connector_menu -label "Connector"
.video_menu add cascade -menu .video_menu.cc_menu -label "Closed caption"
.video_menu add cascade -menu .video_menu.size_menu -label "Size"
+.video_menu add cascade -menu .video_menu.aspect_menu -label "Aspect ratio"
.video_menu add separator
.video_menu add cascade -menu .video_menu.interface_menu -label "User interface"
.video_menu add separator
@@ -736,11 +739,13 @@
.video_menu.size_menu add command -label "480x360" -command "set_video_window_size 480 360"
.video_menu.size_menu add command -label "640x480" -command "set_video_window_size 640 480"
.video_menu.size_menu add command -label "800x600" -command "set_video_window_size 800 600"
-.video_menu.size_menu add radiobutton -label "Unconstrained aspect ratio" -variable aspect_ratio -value [list NONE NONE]
-.video_menu.size_menu add radiobutton -label "Aspect ratio 4:3" -variable aspect_ratio -value [list 4 3]
-.video_menu.size_menu add radiobutton -label "Aspect ratio 3:4" -variable aspect_ratio -value [list 3 4]
-.video_menu.size_menu add radiobutton -label "Aspect ratio 16:9" -variable aspect_ratio -value [list 16 9]
-.video_menu.size_menu add radiobutton -label "Aspect ratio 9:16" -variable aspect_ratio -value [list 9 16]
+
+
+.video_menu.aspect_menu add radiobutton -label "Unconstrained aspect ratio" -variable aspect_ratio -value [list NONE NONE]
+.video_menu.aspect_menu add radiobutton -label "Aspect ratio 4:3" -variable aspect_ratio -value [list 4 3]
+.video_menu.aspect_menu add radiobutton -label "Aspect ratio 3:4" -variable aspect_ratio -value [list 3 4]
+.video_menu.aspect_menu add radiobutton -label "Aspect ratio 16:9" -variable aspect_ratio -value [list 16 9]
+.video_menu.aspect_menu add radiobutton -label "Aspect ratio 9:16" -variable aspect_ratio -value [list 9 16]
.video_menu.interface_menu add command -label "Show setup window" -command "create_setup_window"
.video_menu.interface_menu add command -label "Favorite channel editor" -command scan_channels
|
|
From: <gat...@li...> - 2003-05-05 01:16:41
|
Update of /cvsroot/gatos/ati.2
In directory sc8-pr-cvs1:/tmp/cvs-serv14254
Modified Files:
atixv.c
Log Message:
Correct device id.
Index: atixv.c
===================================================================
RCS file: /cvsroot/gatos/ati.2/atixv.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- atixv.c 15 Feb 2003 20:55:50 -0000 1.29
+++ atixv.c 5 May 2003 01:16:38 -0000 1.30
@@ -457,7 +457,7 @@
xvDeviceID = MAKE_ATOM("XV_DEVICE_ID");
xvLocationID = MAKE_ATOM("XV_LOCATION_ID");
- sprintf(tmp, "RXXX:%d.%d.%d", pATI->PCIInfo->vendor, pATI->PCIInfo->chipType, pATI->PCIInfo->chipRev);
+ sprintf(tmp, "Mach64:%d.%d.%d", pATI->PCIInfo->vendor, pATI->PCIInfo->chipType, pATI->PCIInfo->chipRev);
pPriv->device_id = MAKE_ATOM(tmp);
sprintf(tmp, "PCI:%02d:%02d.%d", pATI->PCIInfo->bus, pATI->PCIInfo->device, pATI->PCIInfo->func);
pPriv->location_id = MAKE_ATOM(tmp);
|