Commit 665d0ef4 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* adapted the extended panel to the latest video filter changes and...

* adapted the extended panel to the latest video filter changes and re-designed the interface a bit (by introducing some additional strings and moving the invert-option to the adjust image section, etc.)
* src/video_output/video_output.c: small fix to insert filters on the fly
parent 2bfe0a06
......@@ -27,15 +27,18 @@
"o_btn_rstrDefaults" = id;
"o_btn_vidFlts_mrInfo" = id;
"o_ckb_blur" = id;
"o_ckb_distortion" = id;
"o_ckb_enblAdjustImg" = id;
"o_ckb_gradient" = id;
"o_ckb_hdphnVirt" = id;
"o_ckb_imgClone" = id;
"o_ckb_imgCrop" = id;
"o_ckb_imgInvers" = id;
"o_ckb_intZoom" = id;
"o_ckb_psycho" = id;
"o_ckb_ripple" = id;
"o_ckb_trnsform" = id;
"o_ckb_vlme_norm" = id;
"o_ckb_wave" = id;
"o_expBtn_adjustImage" = id;
"o_expBtn_audioFlts" = id;
"o_expBtn_videoFlts" = id;
......@@ -47,7 +50,9 @@
"o_lbl_audioFlts" = id;
"o_lbl_brightness" = id;
"o_lbl_contrast" = id;
"o_lbl_distort" = id;
"o_lbl_gamma" = id;
"o_lbl_general" = id;
"o_lbl_hue" = id;
"o_lbl_maxLevel" = id;
"o_lbl_opaque" = id;
......
......@@ -3,18 +3,18 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>219 20 356 292 0 0 1440 878 </string>
<string>253 122 356 292 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>13</key>
<string>525 535 390 138 0 0 1440 878 </string>
<key>32</key>
<string>525 487 390 233 0 0 1440 878 </string>
<string>525 476 390 255 0 0 1440 878 </string>
<key>5</key>
<string>467 464 392 178 0 0 1440 878 </string>
<string>525 489 390 230 0 0 1440 878 </string>
</dict>
<key>IBFramework Version</key>
<string>443.0</string>
<string>446.1</string>
<key>IBLockedObjects</key>
<array>
<integer>32</integer>
......@@ -23,8 +23,9 @@
<array>
<integer>18</integer>
<integer>5</integer>
<integer>32</integer>
</array>
<key>IBSystem Version</key>
<string>8I127</string>
<string>8J135</string>
</dict>
</plist>
......@@ -54,12 +54,17 @@
/* video filters */
IBOutlet id o_btn_vidFlts_mrInfo;
IBOutlet id o_ckb_blur;
IBOutlet id o_ckb_distortion;
IBOutlet id o_ckb_imgClone;
IBOutlet id o_ckb_imgCrop;
IBOutlet id o_ckb_imgInvers;
IBOutlet id o_ckb_trnsform;
IBOutlet id o_ckb_intZoom;
IBOutlet id o_ckb_wave;
IBOutlet id o_ckb_ripple;
IBOutlet id o_ckb_psycho;
IBOutlet id o_ckb_gradient;
IBOutlet id o_lbl_general;
IBOutlet id o_lbl_distort;
/* audio filters */
IBOutlet id o_ckb_vlme_norm;
......@@ -110,7 +115,8 @@
- (void)showPanel;
- (void)initStrings;
- (void)changeVFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
- (void)changeVoutFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
- (void)changeVideoFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
- (void)changeAFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add;
- (void)savePrefs;
@end
This diff is collapsed.
......@@ -1584,11 +1584,8 @@ static int VideoFilter2Callback( vlc_object_t *p_this, char const *psz_cmd,
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
if( !strcmp( oldval.psz_string, newval.psz_string ) )
{
ParseVideoFilter2Chain( p_vout, newval.psz_string );
p_vout->b_vfilter_change = VLC_TRUE;
}
ParseVideoFilter2Chain( p_vout, newval.psz_string );
p_vout->b_vfilter_change = VLC_TRUE;
return VLC_SUCCESS;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment