← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/arch/os2/dialogs/dlg-color.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
http://bugs.debian.org/287640
http://bugs.debian.org/286767
http://bugs.debian.org/152952
http://bugs.debian.org/207942
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/arch/os2/dialogs/dlg-color.c
65
65
    case WM_INITDLG:
66
66
        {
67
67
            long val;
68
 
            SetSliderTxt(hwnd, ID_SATURATION, 0, "0");
 
68
            SetSliderTxt(hwnd, ID_SATURATION,   0, "0");
69
69
            SetSliderTxt(hwnd, ID_SATURATION, 100, "1.0");
70
70
            SetSliderTxt(hwnd, ID_SATURATION, 200, "2.0");
71
71
 
77
77
            SetSliderPos(hwnd, ID_BRIGHTNESS, val/10);
78
78
            resources_get_value("ColorGamma", (void *)&val);
79
79
            SetSliderPos(hwnd, ID_GAMMA, val/10);
 
80
            resources_get_value("PALScanLineShade", (void *)&val);
 
81
            SetSliderPos(hwnd, ID_SCANLINE, val/5);
 
82
            resources_get_value("PALBlur", (void *)&val);
 
83
            SetSliderPos(hwnd, ID_BLUR, val/5);
80
84
        }
81
85
        break;
82
86
 
85
89
            break;
86
90
 
87
91
        canvas_set_value("ColorSaturation", 1000);
88
 
        canvas_set_value("ColorContrast",   1100);
89
 
        canvas_set_value("ColorBrightness", 1100);
90
 
        canvas_set_value("ColorGamma",       900);
 
92
        canvas_set_value("ColorContrast",   1000);
 
93
        canvas_set_value("ColorBrightness", 1000);
 
94
        canvas_set_value("ColorGamma",       880);
 
95
        canvas_set_value("PALScanLineShade", 667);
 
96
        canvas_set_value("PALBlur",          500);
91
97
 
92
98
        SetSliderPos(hwnd, ID_SATURATION, 100);
93
 
        SetSliderPos(hwnd, ID_CONTRAST,   110);
94
 
        SetSliderPos(hwnd, ID_BRIGHTNESS, 110);
95
 
        SetSliderPos(hwnd, ID_GAMMA,       90);
 
99
        SetSliderPos(hwnd, ID_CONTRAST,   100);
 
100
        SetSliderPos(hwnd, ID_BRIGHTNESS, 100);
 
101
        SetSliderPos(hwnd, ID_GAMMA,       88);
 
102
        SetSliderPos(hwnd, ID_SCANLINE,   133);
 
103
        SetSliderPos(hwnd, ID_BLUR,       100);
96
104
 
97
105
        return FALSE;
98
106
 
104
112
        switch (SHORT1FROMMP(mp1))
105
113
        {
106
114
        case ID_SATURATION:
107
 
            canvas_set_value("ColorSaturation", (int)mp2*10);
 
115
            canvas_set_value("ColorSaturation",  (int)mp2*10);
108
116
            break;
109
117
        case ID_CONTRAST:
110
 
            canvas_set_value("ColorContrast",   (int)mp2*10);
 
118
            canvas_set_value("ColorContrast",    (int)mp2*10);
111
119
            break;
112
120
        case ID_BRIGHTNESS:
113
 
            canvas_set_value("ColorBrightness", (int)mp2*10);
 
121
            canvas_set_value("ColorBrightness",  (int)mp2*10);
114
122
            break;
115
123
        case ID_GAMMA:
116
 
            canvas_set_value("ColorGamma",      (int)mp2*10);
 
124
            canvas_set_value("ColorGamma",       (int)mp2*10);
 
125
            break;
 
126
        case ID_SCANLINE:
 
127
            canvas_set_value("PALScanLineShade", (int)mp2* 5);
 
128
            break;
 
129
        case ID_BLUR:
 
130
            canvas_set_value("PALBlur",          (int)mp2* 5);
117
131
            break;
118
132
        }
119
133
        break;
133
147
 
134
148
    hwnd2 = WinLoadStdDlg(hwnd, pm_color, DLG_COLOR, NULL);
135
149
}
136