← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/avidemux/jaunty

« back to all changes in this revision

Viewing changes to avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_contrast.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-17 23:41:46 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217234146-eakx254awuch4wgw
Tags: 1:2.4.4-0.0ubuntu1
* Merge from debian multimedia, Ubuntu remaining changes:
  - debian/control:
    + Build-Depends on newer libx264-dev.
    + Don't Build-Depends on ccache and libamrnb-dev.
    + Build-Depends on libpulse-dev.
    + Fixed small typo in avidemux description.
  - Don't use ccache.
  - Drop patch to fix build with newer x264, it has been merged by upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_contrast.cpp
39
39
#include "DIA_flyDialogQt4.h"
40
40
#include "ADM_videoFilter/ADM_vidContrast.h"
41
41
#include "DIA_flyContrast.h"
 
42
#include "../ADM_toolkit/qtToolkit.h"
42
43
 
43
44
//
44
45
//      Video is in YV12 Colorspace
52
53
 public:
53
54
     flyContrast *myCrop;
54
55
     ADM_QCanvas *canvas;
55
 
     Ui_contrastWindow(CONTRAST_PARAM *param,AVDMGenericVideoStream *in);
 
56
     Ui_contrastWindow(QWidget* parent, CONTRAST_PARAM *param,AVDMGenericVideoStream *in);
56
57
     ~Ui_contrastWindow();
57
58
     Ui_contrastDialog ui;
58
59
 public slots:
65
66
 private:
66
67
     
67
68
 };
68
 
  Ui_contrastWindow::Ui_contrastWindow(CONTRAST_PARAM *param,AVDMGenericVideoStream *in)
 
69
Ui_contrastWindow::Ui_contrastWindow(QWidget* parent, CONTRAST_PARAM *param,AVDMGenericVideoStream *in) : QDialog(parent)
69
70
  {
70
71
    uint32_t width,height;
71
72
        ui.setupUi(this);
155
156
{
156
157
        uint8_t ret=0;
157
158
        
158
 
        Ui_contrastWindow dialog(param,in);        
 
159
        Ui_contrastWindow dialog(qtLastRegisteredDialog(), param,in);
 
160
                qtRegisterDialog(&dialog);
 
161
 
159
162
        if(dialog.exec()==QDialog::Accepted)
160
163
        {
161
164
            dialog.gather(param); 
162
165
            ret=1;
163
166
        }
 
167
 
 
168
                qtUnregisterDialog(&dialog);
 
169
 
164
170
        return ret;
165
171
}
166
172
//____________________________________