[pkg-nvidia-devel] r733 - in /packages/nvidia-settings/trunk/src: gtk+-2.x/ctkgvo.c gtk+-2.x/ctkgvo.h libXNVCtrl/NVCtrl.h

[fabo at users.alioth.debian.org]

Author: fabo
Date: Wed Feb 17 09:47:14 2010
New Revision: 733

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=733
Log:
Update to nvidia-settings 190.53

Modified:
    packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.c
    packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.h
    packages/nvidia-settings/trunk/src/libXNVCtrl/NVCtrl.h

Modified: packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.c
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/src/gtk%2B-2.x/ctkgvo.c?rev=733&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.c (original)
+++ packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.c Wed Feb 17 09:47:14 2010
@@ -183,11 +183,15 @@
     { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_25_00_SMPTE372,     "2048 x 1080p   25.00  Hz  (SMPTE372)"    },
     { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_29_97_SMPTE372,     "2048 x 1080p   29.97  Hz  (SMPTE372)"    },
     { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_30_00_SMPTE372,     "2048 x 1080p   30.00  Hz  (SMPTE372)"    },
+    { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274, "1920 x 1080p   50.00  Hz  (SMPTE274) 3G LEVEL A" },
+    { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274, "1920 x 1080p   59.94  Hz  (SMPTE274) 3G LEVEL A" },
+    { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274, "1920 x 1080p   60.00  Hz  (SMPTE274) 3G LEVEL A" },
+
     { -1, NULL },
 };
 
 
-static GvoFormatDetails videoFormatDetails[] = {
+static GvioFormatDetails videoFormatDetails[] = {
     { NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC, 0, 0, 0 },
     { NV_CTRL_GVIO_VIDEO_FORMAT_576I_50_00_SMPTE259_PAL,  0, 0, 0 },
     { NV_CTRL_GVIO_VIDEO_FORMAT_720P_23_98_SMPTE296,      0, 0, 0 },
@@ -226,6 +230,10 @@
     { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_25_00_SMPTE372,     0, 0, 0 },
     { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_29_97_SMPTE372,     0, 0, 0 },
     { NV_CTRL_GVIO_VIDEO_FORMAT_2048P_30_00_SMPTE372,     0, 0, 0 },
+    { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274, 0, 0, 0 },
+    { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274, 0, 0, 0 },
+    { NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274, 0, 0, 0 },
+
     { -1, -1, -1, -1 },
 };
 

Modified: packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/src/gtk%2B-2.x/ctkgvo.h?rev=733&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.h (original)
+++ packages/nvidia-settings/trunk/src/gtk+-2.x/ctkgvo.h Wed Feb 17 09:47:14 2010
@@ -121,7 +121,7 @@
     int rate;
     int width;
     int height;
-} GvoFormatDetails;
+} GvioFormatDetails;
 
 
 

Modified: packages/nvidia-settings/trunk/src/libXNVCtrl/NVCtrl.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-settings/trunk/src/libXNVCtrl/NVCtrl.h?rev=733&op=diff
==============================================================================
--- packages/nvidia-settings/trunk/src/libXNVCtrl/NVCtrl.h (original)
+++ packages/nvidia-settings/trunk/src/libXNVCtrl/NVCtrl.h Wed Feb 17 09:47:14 2010
@@ -1031,6 +1031,10 @@
 #define NV_CTRL_GVIO_VIDEO_FORMAT_2048P_23_98_SMPTE372          36
 #define NV_CTRL_GVIO_VIDEO_FORMAT_2048I_48_00_SMPTE372          37
 #define NV_CTRL_GVIO_VIDEO_FORMAT_2048I_47_96_SMPTE372          38
+#define NV_CTRL_GVIO_VIDEO_FORMAT_1080P_50_00_3G_LEVEL_A_SMPTE274  39
+#define NV_CTRL_GVIO_VIDEO_FORMAT_1080P_59_94_3G_LEVEL_A_SMPTE274  40
+#define NV_CTRL_GVIO_VIDEO_FORMAT_1080P_60_00_3G_LEVEL_A_SMPTE274  41
+
 
 /* 
  * The following are deprecated; NV_CTRL_GVIO_REQUESTED_VIDEO_FORMAT and the