Commit 99506d97 authored by Benjamin Pracht's avatar Benjamin Pracht

* Adds postprocessing menu

parent 3fe46f29
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
"o_mi_double_window" = id; "o_mi_double_window" = id;
"o_mi_equalizer" = id; "o_mi_equalizer" = id;
"o_mi_faster" = id; "o_mi_faster" = id;
"o_mi_ffmpeg_pp" = id;
"o_mi_fittoscreen" = id; "o_mi_fittoscreen" = id;
"o_mi_floatontop" = id; "o_mi_floatontop" = id;
"o_mi_fullscreen" = id; "o_mi_fullscreen" = id;
...@@ -227,6 +228,7 @@ ...@@ -227,6 +228,7 @@
"o_mu_deinterlace" = id; "o_mu_deinterlace" = id;
"o_mu_device" = id; "o_mu_device" = id;
"o_mu_edit" = id; "o_mu_edit" = id;
"o_mu_ffmpeg_pp" = id;
"o_mu_file" = id; "o_mu_file" = id;
"o_mu_help" = id; "o_mu_help" = id;
"o_mu_program" = id; "o_mu_program" = id;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<key>1617</key> <key>1617</key>
<string>542 480 104 149 0 0 1024 746 </string> <string>542 480 104 149 0 0 1024 746 </string>
<key>29</key> <key>29</key>
<string>521 894 419 44 0 0 1280 1002 </string> <string>41 667 419 44 0 0 1024 746 </string>
<key>915</key> <key>915</key>
<string>54 452 185 199 0 0 1024 746 </string> <string>54 452 185 199 0 0 1024 746 </string>
</dict> </dict>
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>29</integer> <integer>29</integer>
<integer>2029</integer>
<integer>21</integer> <integer>21</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
......
...@@ -203,6 +203,8 @@ struct intf_sys_t ...@@ -203,6 +203,8 @@ struct intf_sys_t
IBOutlet id o_mu_subtitle; IBOutlet id o_mu_subtitle;
IBOutlet id o_mi_deinterlace; IBOutlet id o_mi_deinterlace;
IBOutlet id o_mu_deinterlace; IBOutlet id o_mu_deinterlace;
IBOutlet id o_mi_ffmpeg_pp;
IBOutlet id o_mu_ffmpeg_pp;
IBOutlet id o_mu_window; IBOutlet id o_mu_window;
IBOutlet id o_mi_minimize; IBOutlet id o_mi_minimize;
......
...@@ -464,6 +464,8 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -464,6 +464,8 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mu_subtitle setTitle: _NS("Subtitles Track")]; [o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")]; [o_mu_deinterlace setTitle: _NS("Deinterlace")];
[o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
[o_mu_ffmpeg_pp setTitle: _NS("Post processing")];
[o_mu_window setTitle: _NS("Window")]; [o_mu_window setTitle: _NS("Window")];
[o_mi_minimize setTitle: _NS("Minimize Window")]; [o_mi_minimize setTitle: _NS("Minimize Window")];
...@@ -985,11 +987,26 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -985,11 +987,26 @@ static VLCMain *_o_sharedMainInstance = nil;
if ( p_vout != NULL ) if ( p_vout != NULL )
{ {
vlc_object_t * p_dec_obj;
[o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
var: "video-device" selector: @selector(toggleVar:)]; var: "video-device" selector: @selector(toggleVar:)];
[o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
var: "deinterlace" selector: @selector(toggleVar:)]; var: "deinterlace" selector: @selector(toggleVar:)];
p_dec_obj = (vlc_object_t *)vlc_object_find(
(vlc_object_t *)p_vout,
VLC_OBJECT_DECODER,
FIND_PARENT );
if ( p_dec_obj != NULL )
{
[o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
(vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector:
@selector(toggleVar:)];
vlc_object_release(p_dec_obj);
}
vlc_object_release( (vlc_object_t *)p_vout ); vlc_object_release( (vlc_object_t *)p_vout );
} }
} }
...@@ -1111,6 +1128,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1111,6 +1128,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_mi_subtitle setEnabled: b_enabled]; [o_mi_subtitle setEnabled: b_enabled];
[o_mi_channels setEnabled: b_enabled]; [o_mi_channels setEnabled: b_enabled];
[o_mi_deinterlace setEnabled: b_enabled]; [o_mi_deinterlace setEnabled: b_enabled];
[o_mi_ffmpeg_pp setEnabled: b_enabled];
[o_mi_device setEnabled: b_enabled]; [o_mi_device setEnabled: b_enabled];
[o_mi_screen setEnabled: b_enabled]; [o_mi_screen setEnabled: b_enabled];
} }
......
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