← Back to branch summary

~maco.m/ubuntu/oneiric/nvidia-settings/fix-missing-dependencies-for-kubuntu

« back to all changes in this revision

Viewing changes to src/gtk+-2.x/ctkgvo-banner.c

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone
  • Date: 2010-01-10 12:12:42 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100110121242-oobaomn95w8p3a60
Tags: 190.53-0ubuntu1
https://launchpad.net/bugs/417410
https://launchpad.net/bugs/200868
* New upstream release (LP: #417410).
* debian/control:
  - Add build dependency on cdbs.
  - Remove build dependency on dpatch.
  - Add lpia architecture.
  - Depend on screen-resolution-extra >= 0.12.
* debian/patches/02_nvidia-settings-format-string.patch:
  - Patch from Mandriva to pass formatted strings to gtk dialogs (thus
    reducing gtk warnings).
* debian/patches/03_xf86vidmode-rampsize-check.patch:
  - Fix FTBFS with recent versions of XF86VidMode.
* debian/patches/04_include_xf86vmproto.patch:
 - Include xf86vmproto.h so as to get back XF86VidModeGetGammaRampSize().
* debian/patches/05_polkit.patch:
  - Add support for PolicyKit so that nvidia-settings doesn't require
    that users call it with sudo to edit xorg.conf (LP: #200868)
    (requires screen-resolution-extra >= 0.12).
* debian/rules:
  - Switch to CDBS.
  - Do not provide a desktop file. The different nvidia packages will
    deal with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gtk+-2.x/ctkgvo-banner.c
232
232
    }
233
233
    ctk_gvo_banner->sync_source = val;
234
234
 
235
 
    ret = NvCtrlGetAttribute(handle, NV_CTRL_GVO_OUTPUT_VIDEO_FORMAT, &val);
 
235
    ret = NvCtrlGetAttribute(handle, NV_CTRL_GVIO_REQUESTED_VIDEO_FORMAT, &val);
236
236
    if (ret != NvCtrlSuccess) {
237
 
        val = NV_CTRL_GVO_VIDEO_FORMAT_NONE;
 
237
        val = NV_CTRL_GVIO_VIDEO_FORMAT_NONE;
238
238
    }
239
239
    ctk_gvo_banner->output_video_format = val;
240
240
 
289
289
                     (gpointer) ctk_gvo_banner);
290
290
 
291
291
    g_signal_connect(G_OBJECT(ctk_gvo_banner->ctk_event),
292
 
                     CTK_EVENT_NAME(NV_CTRL_GVO_OUTPUT_VIDEO_FORMAT),
 
292
                     CTK_EVENT_NAME(NV_CTRL_GVIO_REQUESTED_VIDEO_FORMAT),
293
293
                     G_CALLBACK(gvo_event_received),
294
294
                     (gpointer) ctk_gvo_banner);
295
295
 
575
575
         ((banner->sync_source == NV_CTRL_GVO_SYNC_SOURCE_SDI) &&
576
576
          banner->state[GVO_BANNER_SDI] != GVO_LED_SDI_SYNC_NONE))) {
577
577
 
578
 
        if (banner->input_video_format != NV_CTRL_GVO_VIDEO_FORMAT_NONE) {
 
578
        if (banner->input_video_format != NV_CTRL_GVIO_VIDEO_FORMAT_NONE) {
579
579
            /* LED blinks if video format is detected */
580
580
            new = banner->flash ? LED_GREEN : LED_GREY;
581
581
        } else {
607
607
                                      gint output_video_format,
608
608
                                      gint output_data_format)
609
609
{
610
 
    if (output_video_format == NV_CTRL_GVO_VIDEO_FORMAT_NONE) {
 
610
    if (output_video_format == NV_CTRL_GVIO_VIDEO_FORMAT_NONE) {
611
611
        banner->state[GVO_BANNER_VID1] = GVO_LED_VID_OUT_NOT_IN_USE;
612
612
        banner->state[GVO_BANNER_VID2] = GVO_LED_VID_OUT_NOT_IN_USE;
613
613
    } else if ((output_video_format ==
614
 
                NV_CTRL_GVO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC) ||
 
614
                NV_CTRL_GVIO_VIDEO_FORMAT_487I_59_94_SMPTE259_NTSC) ||
615
615
               (output_video_format ==
616
 
                NV_CTRL_GVO_VIDEO_FORMAT_576I_50_00_SMPTE259_PAL)) {
 
616
                NV_CTRL_GVIO_VIDEO_FORMAT_576I_50_00_SMPTE259_PAL)) {
617
617
        banner->state[GVO_BANNER_VID1] = GVO_LED_VID_OUT_SD_MODE;
618
618
        banner->state[GVO_BANNER_VID2] = GVO_LED_VID_OUT_SD_MODE;
619
619
    } else {
675
675
                                  ctk_gvo_banner->output_data_format);
676
676
    } else {
677
677
        update_video_output_state(ctk_gvo_banner,
678
 
                                  NV_CTRL_GVO_VIDEO_FORMAT_NONE,
 
678
                                  NV_CTRL_GVIO_VIDEO_FORMAT_NONE,
679
679
                                  ctk_gvo_banner->output_data_format);
680
680
    }
681
681
 
725
725
    ctk_gvo_banner->sync_source = val;
726
726
 
727
727
 
728
 
    /* query NV_CTRL_GVO_INPUT_VIDEO_FORMAT */
 
728
    /* query NV_CTRL_GVIO_DETECTED_VIDEO_FORMAT */
729
729
    
730
730
    ret = NvCtrlGetAttribute(ctk_gvo_banner->handle,
731
 
                             NV_CTRL_GVO_INPUT_VIDEO_FORMAT, &val);
 
731
                             NV_CTRL_GVIO_DETECTED_VIDEO_FORMAT, &val);
732
732
    
733
733
    if (ret != NvCtrlSuccess) {
734
 
        val = NV_CTRL_GVO_VIDEO_FORMAT_NONE;
 
734
        val = NV_CTRL_GVIO_VIDEO_FORMAT_NONE;
735
735
    }
736
736
    
737
737
    ctk_gvo_banner->input_video_format = val;
813
813
        ctk_gvo_banner->sync_source = value;
814
814
        break;
815
815
 
816
 
    case NV_CTRL_GVO_OUTPUT_VIDEO_FORMAT:
 
816
    case NV_CTRL_GVIO_REQUESTED_VIDEO_FORMAT:
817
817
        ctk_gvo_banner->output_video_format = value;
818
818
        break;
819
819