Commit 3def03c5 authored by David's avatar David

macosx: use new metadata-network-access variable

parent 83eb6767
...@@ -341,7 +341,7 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -341,7 +341,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
NSAlert *albumArtAlert = [NSAlert alertWithMessageText:_NS("Check for album art and metadata?") defaultButton:_NS("Enable Metadata Retrieval") alternateButton:_NS("No, Thanks") otherButton:nil informativeTextWithFormat:@"%@",_NS("VLC can check online for album art and metadata to enrich your playback experience, e.g. by providing track information when playing Audio CDs. To provide this functionality, VLC will send information about your contents to trusted services in an anonymized form.")]; NSAlert *albumArtAlert = [NSAlert alertWithMessageText:_NS("Check for album art and metadata?") defaultButton:_NS("Enable Metadata Retrieval") alternateButton:_NS("No, Thanks") otherButton:nil informativeTextWithFormat:@"%@",_NS("VLC can check online for album art and metadata to enrich your playback experience, e.g. by providing track information when playing Audio CDs. To provide this functionality, VLC will send information about your contents to trusted services in an anonymized form.")];
NSInteger returnValue = [albumArtAlert runModal]; NSInteger returnValue = [albumArtAlert runModal];
config_PutInt(VLCIntf, "album-art", returnValue == 1 ? ALBUM_ART_ALL : ALBUM_ART_WHEN_ASKED); config_PutInt(VLCIntf, "metadata-network-access", returnValue == NSAlertDefaultReturn);
} }
// select playlist item by default // select playlist item by default
......
...@@ -89,8 +89,7 @@ ...@@ -89,8 +89,7 @@
IBOutlet id o_intf_style_txt; IBOutlet id o_intf_style_txt;
IBOutlet id o_intf_style_dark_bcell; IBOutlet id o_intf_style_dark_bcell;
IBOutlet id o_intf_style_bright_bcell; IBOutlet id o_intf_style_bright_bcell;
IBOutlet id o_intf_art_pop; IBOutlet id o_intf_art_ckb;
IBOutlet id o_intf_art_txt;
IBOutlet id o_intf_embedded_ckb; IBOutlet id o_intf_embedded_ckb;
IBOutlet id o_intf_fspanel_ckb; IBOutlet id o_intf_fspanel_ckb;
IBOutlet id o_intf_appleremote_ckb; IBOutlet id o_intf_appleremote_ckb;
......
...@@ -356,7 +356,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc ...@@ -356,7 +356,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
[o_intf_style_txt setStringValue: _NS("Interface style")]; [o_intf_style_txt setStringValue: _NS("Interface style")];
[o_intf_style_dark_bcell setTitle: _NS("Dark")]; [o_intf_style_dark_bcell setTitle: _NS("Dark")];
[o_intf_style_bright_bcell setTitle: _NS("Bright")]; [o_intf_style_bright_bcell setTitle: _NS("Bright")];
[o_intf_art_txt setStringValue: _NS("Album art download policy")];
[o_intf_embedded_ckb setTitle: _NS("Show video within the main window")]; [o_intf_embedded_ckb setTitle: _NS("Show video within the main window")];
[o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode")]; [o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode")];
[o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")]; [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")];
...@@ -557,7 +556,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam ...@@ -557,7 +556,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
} }
[o_intf_language_pop selectItemAtIndex:sel]; [o_intf_language_pop selectItemAtIndex:sel];
[self setupButton: o_intf_art_pop forIntList: "album-art"]; [self setupButton: o_intf_art_ckb forBoolValue: "metadata-network-access"];
[self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"]; [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"];
...@@ -910,7 +909,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha ...@@ -910,7 +909,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha
[defaults setObject:[NSString stringWithUTF8String:ppsz_language[index]] forKey:@"language"]; [defaults setObject:[NSString stringWithUTF8String:ppsz_language[index]] forKey:@"language"];
[defaults synchronize]; [defaults synchronize];
SaveIntList(o_intf_art_pop, "album-art"); config_PutInt(p_intf, "metadata-network-access", [o_intf_art_ckb state]);
config_PutInt(p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state]); config_PutInt(p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state]);
config_PutInt(p_intf, "embedded-video", [o_intf_embedded_ckb state]); config_PutInt(p_intf, "embedded-video", [o_intf_embedded_ckb state]);
......
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