[vlc-commits] macosx: video effects: fix for applying profile settings with different filter strings ( refs #9010)

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sun Jul 21 17:49:16 2013 +0200| [52babf6e6f84151f1483df0c36a085235d4738bf] | committer: David Fuhrmann

macosx: video effects: fix for applying profile settings with different filter strings (refs #9010)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52babf6e6f84151f1483df0c36a085235d4738bf
---

 modules/gui/macosx/VideoEffects.m |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VideoEffects.m b/modules/gui/macosx/VideoEffects.m
index 28f89a0..025467f 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -763,34 +763,35 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     NSString *tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:0] UTF8String])];
     NSArray *tempArray;
     NSUInteger count;
+
     /* enable the new filters */
+    config_PutPsz(p_intf, "video-filter", "");
     if ([tempString length] > 0) {
         tempArray = [tempString componentsSeparatedByString:@":"];
         count = [tempArray count];
         for (NSUInteger x = 0; x < count; x++)
             [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];
     }
-    config_PutPsz(p_intf, "video-filter", [tempString UTF8String]);
 
     tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:1] UTF8String])];
     /* enable another round of new filters */
+    config_PutPsz(p_intf,"sub-source", "");
     if ([tempString length] > 0) {
         tempArray = [tempString componentsSeparatedByString:@":"];
         count = [tempArray count];
         for (NSUInteger x = 0; x < count; x++)
             [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];
     }
-    config_PutPsz(p_intf,"sub-source", [tempString UTF8String]);
 
     tempString = [NSString stringWithFormat:@"%s", vlc_b64_decode([[items objectAtIndex:2] UTF8String])];
     /* enable another round of new filters */
+    config_PutPsz(p_intf,"video-splitter", "");
     if ([tempString length] > 0) {
         tempArray = [tempString componentsSeparatedByString:@":"];
         count = [tempArray count];
         for (NSUInteger x = 0; x < count; x++)
             [self setVideoFilter:(char *)[[tempArray objectAtIndex:x] UTF8String] on:YES];
     }
-    config_PutPsz(p_intf,"video-splitter", [tempString UTF8String]);
 
     /* try to set filter values on-the-fly and store them appropriately */
     [self setVideoFilterProperty:"hue" forFilter:"adjust" integer:[[items objectAtIndex:3] intValue]];