Changes of Revision 177

View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/extensions/NSString+Helpers.h -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/extensions/NSString+Helpers.h Changed
​x
 
1
@@ -28,7 +28,12 @@
2
 #import <Cocoa/Cocoa.h>
3
 #import <vlc_input.h>
4
5
-#define _NS(s) ((s) ? toNSStr(vlc_gettext(s)) : @"")
6
+#define NSTR(s) ((s) ? toNSStr(vlc_gettext(s)) : @"")
7
+
8
+/**
9
+ * For marking translatable static strings (like `_()`)
10
+ */
11
+#define _NS(s) NSTR(s)
12
13
 /**
14
  * Get a contextualized translation string
15
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/menus/VLCMainMenu.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/menus/VLCMainMenu.m Changed
37
 
1
@@ -314,7 +314,7 @@
2
     for (int i = 0; i < p_item->list_count; i++) {
3
         NSMenuItem *mi;
4
         if (p_item->list_text != NULL)
5
-            mi = [[NSMenuItem alloc] initWithTitle: _NS(p_item->list_text[i]) action:NULL keyEquivalent: @""];
6
+            mi = [[NSMenuItem alloc] initWithTitle: NSTR(p_item->list_text[i]) action:NULL keyEquivalent: @""];
7
         else if (p_item->list.i[i])
8
             mi = [[NSMenuItem alloc] initWithTitle: [NSString stringWithFormat: @"%d", p_item->list.i[i]] action:NULL keyEquivalent: @""];
9
         else {
10
@@ -1609,7 +1609,7 @@
11
12
     /* Get the descriptive name of the variable */
13
     var_Change(p_object, psz_variable, VLC_VAR_GETTEXT, &text);
14
-    [menuItem setTitle: _NS(text ? text : psz_variable)];
15
+    [menuItem setTitle: NSTR(text ? text : psz_variable)];
16
17
     if (i_type & VLC_VAR_HASCHOICE) {
18
         NSMenu *menu = [menuItem submenu];
19
@@ -1739,7 +1739,7 @@
20
         switch(i_type & VLC_VAR_TYPE) {
21
             case VLC_VAR_STRING:
22
23
-                title = _NS(text_list[i] ? text_list[i] : val_list[i].psz_string);
24
+                title = NSTR(text_list[i] ? text_list[i] : val_list[i].psz_string);
25
26
                 lmi = [menu addItemWithTitle:title action:pf_callback keyEquivalent:@""];
27
                 data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName:psz_variable
28
@@ -1760,7 +1760,7 @@
29
             case VLC_VAR_INTEGER:
30
31
                 title = text_list[i] ?
32
-                _NS(text_list[i]) : [NSString stringWithFormat:@"%"PRId64, val_list[i].i_int];
33
+                NSTR(text_list[i]) : [NSString stringWithFormat:@"%"PRId64, val_list[i].i_int];
34
35
                 lmi = [menu addItemWithTitle: title action: pf_callback keyEquivalent: @""];
36
                 data = [[VLCAutoGeneratedMenuContent alloc] initWithVariableName:psz_variable
37
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/panels/VLCInformationWindowController.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/panels/VLCInformationWindowController.m Changed
50
 
1
@@ -126,8 +126,8 @@
2
     [self.window setTitle: _NS("Media Information")];
3
4
     [_uriLabel setStringValue: _NS("Location")];
5
-    [_titleLabel setStringValue: _NS(VLC_META_TITLE)];
6
-    [_artistLabel setStringValue: _NS(VLC_META_ARTIST)];
7
+    [_titleLabel setStringValue: NSTR(VLC_META_TITLE)];
8
+    [_artistLabel setStringValue: NSTR(VLC_META_ARTIST)];
9
     [_saveMetaDataButton setStringValue: _NS("Save Metadata")];
10
11
     [_segmentedView setLabel:_NS("General") forSegment:0];
12
@@ -135,22 +135,22 @@
13
     [_segmentedView setLabel:_NS("Statistics") forSegment:2];
14
15
     /* constants defined in vlc_meta.h */
16
-    [_genreLabel setStringValue: _NS(VLC_META_GENRE)];
17
-    [_copyrightLabel setStringValue: _NS(VLC_META_COPYRIGHT)];
18
-    [_albumLabel setStringValue: _NS(VLC_META_ALBUM)];
19
-    [_trackNumberLabel setStringValue: _NS(VLC_META_TRACK_NUMBER)];
20
+    [_genreLabel setStringValue: NSTR(VLC_META_GENRE)];
21
+    [_copyrightLabel setStringValue: NSTR(VLC_META_COPYRIGHT)];
22
+    [_albumLabel setStringValue: NSTR(VLC_META_ALBUM)];
23
+    [_trackNumberLabel setStringValue: NSTR(VLC_META_TRACK_NUMBER)];
24
     [_trackTotalLabel setStringValue: _NS("Track Total")];
25
-    [_descriptionLabel setStringValue: _NS(VLC_META_DESCRIPTION)];
26
-    [_dateLabel setStringValue: _NS(VLC_META_DATE)];
27
-    [_languageLabel setStringValue: _NS(VLC_META_LANGUAGE)];
28
-    [_nowPlayingLabel setStringValue: _NS(VLC_META_NOW_PLAYING)];
29
-    [_publisherLabel setStringValue: _NS(VLC_META_PUBLISHER)];
30
-    [_encodedbyLabel setStringValue: _NS(VLC_META_ENCODED_BY)];
31
-    [_showNameLabel setStringValue: _NS(VLC_META_SHOW_NAME)];
32
-    [_episodeLabel setStringValue: _NS(VLC_META_EPISODE)];
33
-    [_seasonLabel setStringValue: _NS(VLC_META_SEASON)];
34
-    [_actorsLabel setStringValue: _NS(VLC_META_ACTORS)];
35
-    [_directorLabel setStringValue: _NS(VLC_META_DIRECTOR)];
36
+    [_descriptionLabel setStringValue: NSTR(VLC_META_DESCRIPTION)];
37
+    [_dateLabel setStringValue: NSTR(VLC_META_DATE)];
38
+    [_languageLabel setStringValue: NSTR(VLC_META_LANGUAGE)];
39
+    [_nowPlayingLabel setStringValue: NSTR(VLC_META_NOW_PLAYING)];
40
+    [_publisherLabel setStringValue: NSTR(VLC_META_PUBLISHER)];
41
+    [_encodedbyLabel setStringValue: NSTR(VLC_META_ENCODED_BY)];
42
+    [_showNameLabel setStringValue: NSTR(VLC_META_SHOW_NAME)];
43
+    [_episodeLabel setStringValue: NSTR(VLC_META_EPISODE)];
44
+    [_seasonLabel setStringValue: NSTR(VLC_META_SEASON)];
45
+    [_actorsLabel setStringValue: NSTR(VLC_META_ACTORS)];
46
+    [_directorLabel setStringValue: NSTR(VLC_META_DIRECTOR)];
47
48
     /* statistics */
49
     [_inputLabel setStringValue: _NS("Input")];
50
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/preferences/VLCSimplePrefsController.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/preferences/VLCSimplePrefsController.m Changed
64
 
1
@@ -286,9 +286,9 @@
2
     } else if ([itemIdent isEqual: VLCVideoSettingToolbarIdentifier]) {
3
         CreateToolbarItem(_NS("Video"), _NS("Video Settings"), @"VLCVideoCone", showVideoSettings);
4
     } else if ([itemIdent isEqual: VLCOSDSettingToolbarIdentifier]) {
5
-        CreateToolbarItem(_NS(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"VLCSubtitleCone", showOSDSettings);
6
+        CreateToolbarItem(NSTR(SUBPIC_TITLE), _NS("Subtitle & On Screen Display Settings"), @"VLCSubtitleCone", showOSDSettings);
7
     } else if ([itemIdent isEqual: VLCInputSettingToolbarIdentifier]) {
8
-        CreateToolbarItem(_NS(INPUT_TITLE), _NS("Input & Codec Settings"), @"VLCInputCone", showInputSettings);
9
+        CreateToolbarItem(NSTR(INPUT_TITLE), _NS("Input & Codec Settings"), @"VLCInputCone", showInputSettings);
10
     } else if ([itemIdent isEqual: VLCMediaLibrarySettingToolbarIdentifier]) {
11
         CreateToolbarItem(_NS("Media Library"), _NS("Media Library settings"), @"NXHelpBacktrack", showMediaLibrarySettings);
12
     } else if ([itemIdent isEqual: VLCHotkeysSettingToolbarIdentifier]) {
13
@@ -530,7 +530,7 @@
14
     free(values);
15
16
     if (p_item->psz_longtext)
17
-        [object setToolTip: _NS(p_item->psz_longtext)];
18
+        [object setToolTip: NSTR(p_item->psz_longtext)];
19
 }
20
21
 // just for clarification that this is a module list
22
@@ -565,20 +565,20 @@
23
     free(texts);
24
25
     if (p_item->psz_longtext)
26
-        [object setToolTip: _NS(p_item->psz_longtext)];
27
+        [object setToolTip: NSTR(p_item->psz_longtext)];
28
 }
29
30
 - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
31
 {
32
     [object setState: config_GetInt(name)];
33
-    [object setToolTip: _NS(config_GetLabel(p_intf, name))];
34
+    [object setToolTip: NSTR(config_GetLabel(p_intf, name))];
35
 }
36
37
 - (void)setupField:(NSTextField *)object forOption:(const char *)psz_option
38
 {
39
     char *psz_tmp = config_GetPsz(psz_option);
40
     [object setStringValue: toNSStr(psz_tmp)];
41
-    [object setToolTip: _NS(config_GetLabel(p_intf, psz_option))];
42
+    [object setToolTip: NSTR(config_GetLabel(p_intf, psz_option))];
43
     free(psz_tmp);
44
 }
45
46
@@ -810,7 +810,7 @@
47
     i = config_GetInt("freetype-opacity") * 100.0 / 255.0 + 0.5;
48
     [_osd_opacityTextField setIntValue: i];
49
     [_osd_opacitySlider setIntValue: i];
50
-    [_osd_opacitySlider setToolTip: _NS(config_GetLabel(p_intf, "freetype-opacity"))];
51
+    [_osd_opacitySlider setToolTip: NSTR(config_GetLabel(p_intf, "freetype-opacity"))];
52
     [_osd_opacityTextField setToolTip: [_osd_opacitySlider toolTip]];
53
     [self setupButton:_osd_forceboldCheckbox forBoolValue: "freetype-bold"];
54
     [self setupButton:_osd_outline_colorPopup forIntList: "freetype-outline-color"];
55
@@ -837,7 +837,7 @@
56
         if (p_item->i_type == CONFIG_ITEM_KEY
57
            && strncmp(p_item->psz_name, "global-", 7) != 0
58
            && !EMPTY_STR(p_item->psz_text)) {
59
-            [tempArray_desc addObject: _NS(p_item->psz_text)];
60
+            [tempArray_desc addObject: NSTR(p_item->psz_text)];
61
             [tempArray_names addObject: toNSStr(p_item->psz_name)];
62
             if (p_item->value.psz)
63
                 [_hotkeySettings addObject: toNSStr(p_item->value.psz)];
64
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/preferences/prefs.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/preferences/prefs.m Changed
50
 
1
@@ -626,42 +626,42 @@
2
3
 - (id)initWithCategory:(enum vlc_config_cat)category
4
 {
5
-    NSString * name = _NS(vlc_config_cat_GetName(category));
6
+    NSString * name = toNSStr(vlc_config_cat_GetName(category));
7
     if (self = [super initWithName:name]) {
8
         _branchType = CategoryBranch;
9
         _category = category;
10
         _subcategory = SUBCAT_UNKNOWN;
11
         _configItems = nil;
12
         _configSize = 0;
13
-        //_help = [_NS(vlc_config_cat_GetHelp(category)) retain];
14
+        //_help = [toNSStr(vlc_config_cat_GetHelp(category)) retain];
15
     }
16
     return self;
17
 }
18
19
 - (id)initWithSubcategory:(enum vlc_config_subcat)subcategory
20
 {
21
-    NSString * name = _NS(vlc_config_subcat_GetName(subcategory));
22
+    NSString * name = toNSStr(vlc_config_subcat_GetName(subcategory));
23
     if (self = [super initWithName:name]) {
24
         _branchType = SubcategoryBranch;
25
         _category = CAT_UNKNOWN;
26
         _subcategory = subcategory;
27
         _configItems = nil;
28
         _configSize = 0;
29
-        //_help = [_NS(vlc_config_subcat_GetHelp(subcategory)) retain];
30
+        //_help = [toNSStr(vlc_config_subcat_GetHelp(subcategory)) retain];
31
     }
32
     return self;
33
 }
34
35
 - (id)initWithPlugin:(module_t *)plugin
36
 {
37
-    NSString * name = _NS(module_get_name(plugin, false));
38
+    NSString * name = NSTR(module_get_name(plugin, false));
39
     if (self = [super initWithName:name]) {
40
         _branchType = PluginBranch;
41
         _category = CAT_UNKNOWN;
42
         _subcategory = SUBCAT_UNKNOWN;
43
         _configItems = module_config_get(plugin, &_configSize);
44
         //_plugin = plugin;
45
-        //_help = [_NS(vlc_config_subcat_GetHelp(subcategory)) retain];
46
+        //_help = [toNSStr(vlc_config_subcat_GetHelp(subcategory)) retain];
47
     }
48
     return self;
49
 }
50
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/preferences/prefs_widgets.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/preferences/prefs_widgets.m Changed
201
 
1
@@ -840,7 +840,7 @@
2
3
 - (NSString *)name
4
 {
5
-    return _NS(psz_name);
6
+    return toNSStr(psz_name);
7
 }
8
9
 - (int)intValue
10
@@ -927,10 +927,10 @@
11
         else
12
             self.viewType = CONFIG_ITEM_STRING;
13
14
-        o_textfieldTooltip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
15
+        o_textfieldTooltip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
16
17
         /* add the label */
18
-        labelString = _NS(p_item->psz_text);
19
+        labelString = NSTR(p_item->psz_text);
20
         ADD_LABEL(self.label, mainFrame, 0, -3, labelString, o_textfieldTooltip)
21
         [self.label setAutoresizingMask:NSViewNotSizable ];
22
         [self addSubview: self.label];
23
@@ -1004,10 +1004,10 @@
24
         else
25
             self.viewType = CONFIG_ITEM_MODULE;
26
27
-        o_textfieldTooltip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
28
+        o_textfieldTooltip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
29
30
         /* add the label */
31
-        labelString = _NS(p_item->psz_text);
32
+        labelString = NSTR(p_item->psz_text);
33
         ADD_LABEL(self.label, mainFrame, 0, -3, labelString, o_textfieldTooltip)
34
         [self.label setAutoresizingMask:NSViewNotSizable ];
35
         [self addSubview: self.label];
36
@@ -1102,13 +1102,13 @@
37
     if (self = [super initWithFrame:mainFrame item:p_item]) {
38
         self.viewType = CONFIG_ITEM_LOADFILE;
39
40
-        o_itemTooltip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
41
+        o_itemTooltip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
42
43
         /* is it a directory */
44
         b_directory = ([self type] == CONFIG_ITEM_DIRECTORY) ? YES : NO;
45
46
         /* add the label */
47
-        labelString = _NS(p_item->psz_text);
48
+        labelString = NSTR(p_item->psz_text);
49
         ADD_LABEL(self.label, mainFrame, 0, 3, labelString, o_itemTooltip)
50
         [self.label setAutoresizingMask:NSViewNotSizable ];
51
         [self addSubview: self.label];
52
@@ -1190,10 +1190,10 @@
53
     if (self = [super initWithFrame:mainFrame item:p_item]) {
54
         self.viewType = CONFIG_ITEM_MODULE;
55
56
-        o_popupTooltip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
57
+        o_popupTooltip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
58
59
         /* add the label */
60
-        labelString = _NS(p_item->psz_text);
61
+        labelString = NSTR(p_item->psz_text);
62
63
         ADD_LABEL(self.label, mainFrame, 0, -1, labelString, o_popupTooltip)
64
         [self.label setAutoresizingMask:NSViewNotSizable ];
65
@@ -1249,7 +1249,7 @@
66
             /* Hack: required subcategory is stored in i_min */
67
             if (p_cfg->i_type == CONFIG_SUBCATEGORY &&
68
                 p_cfg->value.i == self.p_item->min.i) {
69
-                NSString *o_description = _NS(module_GetLongName(p_parser));
70
+                NSString *o_description = NSTR(module_GetLongName(p_parser));
71
                 if ([newval isEqualToString: o_description]) {
72
                     returnval = strdup(module_get_object(p_parser));
73
                     break;
74
@@ -1286,7 +1286,7 @@
75
             /* Hack: required subcategory is stored in i_min */
76
             if (p_config->i_type == CONFIG_SUBCATEGORY &&
77
                 p_config->value.i == self.p_item->min.i) {
78
-                NSString *o_description = _NS(module_GetLongName(p_parser));
79
+                NSString *o_description = NSTR(module_GetLongName(p_parser));
80
                 [o_popup addItemWithTitle: o_description];
81
82
                 if (self.p_item->value.psz && !strcmp(self.p_item->value.psz,
83
@@ -1322,10 +1322,10 @@
84
     if (self = [super initWithFrame:mainFrame item:p_item]) {
85
         self.viewType = CONFIG_ITEM_INTEGER;
86
87
-        toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
88
+        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
89
90
         /* add the label */
91
-        labelString = _NS((char *)p_item->psz_text);
92
+        labelString = NSTR((char *)p_item->psz_text);
93
         ADD_LABEL(self.label, mainFrame, 0, -3, labelString, toolTip)
94
         [self.label setAutoresizingMask:NSViewNotSizable ];
95
         [self addSubview: self.label];
96
@@ -1411,10 +1411,10 @@
97
     if (self = [super initWithFrame:mainFrame item:p_item]) {
98
         self.viewType = CONFIG_ITEM_STRING_LIST;
99
100
-        o_textfieldTooltip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
101
+        o_textfieldTooltip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
102
103
         /* add the label */
104
-        labelString = _NS(p_item->psz_text);
105
+        labelString = NSTR(p_item->psz_text);
106
         ADD_LABEL(self.label, mainFrame, 0, -3, labelString, o_textfieldTooltip)
107
         [self.label setAutoresizingMask:NSViewNotSizable ];
108
         [self addSubview: self.label];
109
@@ -1501,10 +1501,10 @@
110
     if (self = [super initWithFrame: mainFrame item:p_item]) {
111
         self.viewType = CONFIG_ITEM_RANGED_INTEGER;
112
113
-        toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
114
+        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
115
116
         /* add the label */
117
-        labelString = _NS(p_item->psz_text);
118
+        labelString = NSTR(p_item->psz_text);
119
         ADD_LABEL(self.label, mainFrame, 0, -3, labelString, toolTip)
120
         [self.label setAutoresizingMask:NSViewNotSizable ];
121
         [self addSubview: self.label];
122
@@ -1613,10 +1613,10 @@
123
     if (self = [super initWithFrame:mainFrame item:p_item]) {
124
         self.viewType = CONFIG_ITEM_INTEGER;
125
126
-        toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
127
+        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
128
129
         /* add the label */
130
-        labelString = _NS(p_item->psz_text);
131
+        labelString = NSTR(p_item->psz_text);
132
         ADD_LABEL(self.label, mainFrame, 0, -2, labelString, toolTip)
133
         [self.label setAutoresizingMask:NSViewNotSizable ];
134
         [self addSubview: self.label];
135
@@ -1704,10 +1704,10 @@
136
     if (self = [super initWithFrame:mainFrame item:p_item]) {
137
         self.viewType = CONFIG_ITEM_RANGED_INTEGER;
138
139
-        toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
140
+        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
141
142
         /* add the label */
143
-        labelString = _NS(p_item->psz_text);
144
+        labelString = NSTR(p_item->psz_text);
145
         ADD_LABEL(self.label, mainFrame, 0, -3, labelString, toolTip)
146
         [self.label setAutoresizingMask:NSViewNotSizable ];
147
         [self addSubview: self.label];
148
@@ -1815,9 +1815,9 @@
149
     if (self != nil) {
150
         self.viewType = CONFIG_ITEM_BOOL;
151
152
-        labelString = _NS(p_item->psz_text);
153
+        labelString = NSTR(p_item->psz_text);
154
155
-        toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
156
+        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
157
158
         /* add the checkbox */
159
         ADD_CHECKBOX(o_checkbox, mainFrame, 0,
160
@@ -1860,10 +1860,10 @@
161
     if (self = [super initWithFrame:mainFrame item:p_item]) {
162
         self.viewType = CONFIG_ITEM_KEY;
163
164
-        toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
165
+        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
166
167
         /* add the label */
168
-        labelString = _NS(p_item->psz_text);
169
+        labelString = NSTR(p_item->psz_text);
170
         ADD_LABEL(self.label, mainFrame, 0, -1, labelString, toolTip)
171
         [self.label setAutoresizingMask:NSViewNotSizable ];
172
         [self addSubview: self.label];
173
@@ -1995,7 +1995,7 @@
174
 o_moduleenabled = [NSNumber numberWithBool:YES];\
175
 else \
176
 o_moduleenabled = [NSNumber numberWithBool:NO];\
177
-[o_modulearray addObject:[NSMutableArray arrayWithObjects: @shortname, _NS(longname), o_moduleenabled, nil]]
178
+[o_modulearray addObject:[NSMutableArray arrayWithObjects: @shortname, NSTR(longname), o_moduleenabled, nil]]
179
180
                     addLuaIntf("http", "Web");
181
                     addLuaIntf("telnet", "Telnet");
182
@@ -2076,16 +2076,16 @@
183
     mainFrame.origin.y = 0;
184
     self.frame = mainFrame;
185
186
-    toolTip = [_NS(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
187
+    toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
188
189
     /* add the label */
190
-    labelString = _NS((char *)p_item->psz_text);
191
+    labelString = NSTR((char *)p_item->psz_text);
192
     ADD_LABEL(self.label, mainFrame, 0, -3, labelString, toolTip)
193
     [self.label setAutoresizingMask:NSViewNotSizable ];
194
     [self addSubview: self.label];
195
196
     /* build the textfield */
197
-    o_textfieldString = _NS(p_item->value.psz);
198
+    o_textfieldString = NSTR(p_item->value.psz);
199
     ADD_TEXTFIELD(o_textfield, mainFrame, [self.label frame].size.width + 2,
200
                   mainFrame.size.height - 22, mainFrame.size.width -
201
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/windows/VLCHelpWindowController.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/windows/VLCHelpWindowController.m Changed
10
 
1
@@ -61,7 +61,7 @@
2
 {
3
     NSString *htmlWithStyle = [NSString
4
                                stringWithFormat:@"<style>body { font-family: -apple-system, Helvetica Neue; }</style>%@",
5
-                               _NS(I_LONGHELP)];
6
+                               NSTR(I_LONGHELP)];
7
8
     [[helpWebView mainFrame] loadHTMLString:htmlWithStyle
9
                                     baseURL:[NSURL URLWithString:@"https://videolan.org"]];
10
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/macosx/windows/VLCOpenWindowController.m -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/macosx/windows/VLCOpenWindowController.m Changed
19
 
1
@@ -290,7 +290,7 @@
2
3
     if (p_item) {
4
         for (int i = 0; i < p_item->list_count; i++) {
5
-            [_fileSubEncodingPopup addItemWithTitle: _NS(p_item->list_text[i])];
6
+            [_fileSubEncodingPopup addItemWithTitle: NSTR(p_item->list_text[i])];
7
             [[_fileSubEncodingPopup lastItem] setRepresentedObject:[NSString stringWithFormat:@"%s", p_item->list.psz[i]]];
8
             if (p_item->value.psz && !strcmp(p_item->value.psz, p_item->list.psz[i]))
9
                 [_fileSubEncodingPopup selectItem: [_fileSubEncodingPopup lastItem]];
10
@@ -304,7 +304,7 @@
11
12
     if (p_item) {
13
         for (i_index = 0; i_index < p_item->list_count; i_index++)
14
-            [_fileSubAlignPopup addItemWithTitle: _NS(p_item->list_text[i_index])];
15
+            [_fileSubAlignPopup addItemWithTitle: NSTR(p_item->list_text[i_index])];
16
17
         [_fileSubAlignPopup selectItemAtIndex: p_item->value.i];
18
     }
19
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/qt/network/qml/NetworkCustomCover.qml -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/qt/network/qml/NetworkCustomCover.qml Changed
9
 
1
@@ -34,7 +34,6 @@
2
         anchors.centerIn: parent
3
         visible: !networkModel.artwork || networkModel.artwork.toString() === ""
4
         height: iconSize
5
-        mipmap: true
6
         sourceSize: Qt.size(width, height)
7
         source: {
8
             switch (networkModel.type) {
9
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/qt/network/qml/NetworkThumbnailItem.qml -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/qt/network/qml/NetworkThumbnailItem.qml Changed
9
 
1
@@ -86,7 +86,6 @@
2
         source: item.rowModel.artwork
3
         visible: item.rowModel.artwork
4
                  && item.rowModel.artwork.toString() !== ""
5
-        mipmap: true
6
7
         Widgets.PlayCover {
8
             anchors.centerIn: parent
9
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml Changed
9
 
1
@@ -134,7 +134,6 @@
2
             Image {
3
                 id: artwork
4
5
-                mipmap: true
6
                 anchors.fill: parent
7
                 fillMode: Image.PreserveAspectFit
8
                 source: (model.artwork && model.artwork.toString()) ? model.artwork : VLCStyle.noArtCover
9
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/qt/widgets/native/roundimage.cpp -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/qt/widgets/native/roundimage.cpp Changed
11
 
1
@@ -151,7 +151,8 @@
2
             assert(window());
3
4
             QSGTexture* texture = window()->createTextureFromImage(m_roundImage,
5
-                QQuickWindow::TextureHasAlphaChannel);
6
+                static_cast<QQuickWindow::CreateTextureOptions>(QQuickWindow::TextureHasAlphaChannel |
7
+                                                                QQuickWindow::TextureCanUseAtlas));
8
9
             if (texture)
10
             {
11
​
View file
_service:obs_scm:vlc-beta-20220128.3b46bf985e.obscpio/modules/gui/qt/widgets/qml/DragItem.qml -> _service:obs_scm:vlc-beta-20220128.270f173287.obscpio/modules/gui/qt/widgets/qml/DragItem.qml Changed
9
 
1
@@ -348,7 +348,6 @@
2
         id: artworkLoader
3
4
         Image {
5
-            mipmap: true
6
             fillMode: Image.PreserveAspectCrop
7
             width: coverSize
8
             height: coverSize
9
​
View file
_service:obs_scm:vlc-beta.obsinfo Changed
10
 
1
@@ -1,5 +1,5 @@
2
 name: vlc-beta
3
-version: 20220128.3b46bf985e
4
-mtime: 1643383312
5
-commit: 3b46bf985e050864e9b284df23e0fd882521fa8b
6
+version: 20220128.270f173287
7
+mtime: 1643391496
8
+commit: 270f173287ee3fc96dd9955d133fa1f72e24e371
9
10
​
Locations
Help
Contact