[vlc-commits] macosx: advanced prefs: remove scroll view from module list table view, fix layout

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 21:42:10 2014 +0100| [eefea32ab53757717aa54d8c6093ae147d0cfce9] | committer: 
David Fuhrmann

macosx: advanced prefs: remove scroll view from module list table view, fix 
layout

close #9971

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

 modules/gui/macosx/prefs_widgets.m |  101 
 1 file changed, 46 insertions(+), 55 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.m 
b/modules/gui/macosx/prefs_widgets.m
index af12405..bd800b8 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -2050,7 +2050,51 @@ else\
 } /* FOR i_module_index */
 module_list_free(p_list);
 
-mainFrame.size.height = 30 + 20 * [o_modulearray count];
+
+// First, initialize and draw the table view to get its height
+NSRect s_rc = NSMakeRect(12, 10, mainFrame.size.width - LEFTMARGIN - 
RIGHTMARGIN, 50);
+// height is automatically increased as needed
+NSTableView *o_tableview;
+o_tableview = [[NSTableView alloc] initWithFrame : s_rc];
+[o_tableview setUsesAlternatingRowBackgroundColors:YES];
+[o_tableview setHeaderView:nil];
+/* FIXME: support for multiple selection... */
+//[o_tableview setAllowsMultipleSelection:YES];
+
+NSCell *o_headerCell = [[NSCell alloc] initTextCell:@Enabled];
+NSCell *o_dataCell = [[NSButtonCell alloc] init];
+[(NSButtonCell*)o_dataCell setButtonType:NSSwitchButton];
+[o_dataCell setTitle:@];
+[o_dataCell setFont:[NSFont systemFontOfSize:0]];
+NSTableColumn *o_tableColumn = [[NSTableColumn alloc]
+initWithIdentifier:@Enabled];
+[o_tableColumn setHeaderCell: o_headerCell];
+[o_tableColumn setDataCell: o_dataCell];
+[o_tableColumn setWidth:17];
+[o_tableview addTableColumn: o_tableColumn];
+
+o_headerCell = [[NSCell alloc] initTextCell:@Module Name];
+o_dataCell = [[NSTextFieldCell alloc] init];
+[o_dataCell setFont:[NSFont systemFontOfSize:12]];
+o_tableColumn = [[NSTableColumn alloc]
+ initWithIdentifier:@Module];
+[o_tableColumn setHeaderCell: o_headerCell];
+[o_tableColumn setDataCell: o_dataCell];
+[o_tableColumn setWidth:s_rc.size.width - 34];
+[o_tableview addTableColumn: o_tableColumn];
+[o_tableview registerForDraggedTypes:[NSArray arrayWithObject:@VLC media 
player module]];
+
+[o_tableview setDataSource:self];
+[o_tableview setTarget: self];
+[o_tableview setAction: @selector(tableChanged:)];
+[o_tableview sendActionOn:NSLeftMouseUpMask | NSLeftMouseDownMask |
+ NSLeftMouseDraggedMask];
+
+[o_tableview reloadData];
+
+CGFloat tableview_height = [o_tableview frame].size.height;
+
+mainFrame.size.height = 40 + tableview_height;
 mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
 mainFrame.origin.x = LEFTMARGIN;
 mainFrame.origin.y = 0;
@@ -2079,60 +2123,7 @@ else\
 [o_textfield setAutoresizingMask:NSViewWidthSizable ];
 [self addSubview: o_textfield];
 
-
-{
-NSRect s_rc = mainFrame;
-s_rc.size.height = mainFrame.size.height - 30;
-s_rc.size.width = mainFrame.size.width - 12;
-s_rc.origin.x = 12;
-s_rc.origin.y = 0;
-o_scrollview = [[[NSScrollView alloc] initWithFrame: s_rc] retain];
-[o_scrollview setDrawsBackground: NO];
-[o_scrollview setBorderType: NSBezelBorder];
-[o_scrollview setAutohidesScrollers:YES];
-
-NSTableView *o_tableview;
-o_tableview = [[NSTableView alloc] initWithFrame : s_rc];
-[o_tableview setUsesAlternatingRowBackgroundColors:YES];
-[o_tableview setHeaderView:nil];
-/* TODO: find a good way to fix the row height and text size*/
-/* FIXME: support for multiple selection... */
-//[o_tableview setAllowsMultipleSelection:YES];
-
-NSCell *o_headerCell = [[NSCell alloc] initTextCell:@Enabled];
-NSCell *o_dataCell = [[NSButtonCell alloc] init];
-[(NSButtonCell*)o_dataCell setButtonType:NSSwitchButton];
-[o_dataCell setTitle:@];
-[o_dataCell setFont:[NSFont systemFontOfSize:0]];
-NSTableColumn *o_tableColumn = [[NSTableColumn alloc]
-initWithIdentifier:@Enabled];
-[o_tableColumn setHeaderCell: o_headerCell];
-[o_tableColumn setDataCell: o_dataCell];
-[o_tableColumn setWidth:17];
-[o_tableview addTableColumn: o_tableColumn];
-
-o_headerCell = [[NSCell alloc] initTextCell:@Module Name];
-o_dataCell = [[NSTextFieldCell alloc] init];
-[o_dataCell setFont:[NSFont systemFontOfSize:12]];
-o_tableColumn = 

[vlc-commits] vout/macosx: use shorter name

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 19:43:47 2014 +0100| [eab8b4acfd921903639aeee57f10e67248c39c41] | committer: 
David Fuhrmann

vout/macosx: use shorter name

This is a user-visible string, not the developers doku.

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

 modules/video_output/macosx.m |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index aa3b020..17752b7 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -83,7 +83,7 @@ static void OpenglSwap (vlc_gl_t *gl);
 vlc_module_begin ()
 /* Will be loaded even without interface module. see voutgl.m */
 set_shortname (Mac OS X)
-set_description (N_(Mac OS X OpenGL video output (requires 
drawable-nsobject)))
+set_description (N_(Mac OS X OpenGL video output))
 set_category (CAT_VIDEO)
 set_subcategory (SUBCAT_VIDEO_VOUT)
 set_capability (vout display, 300)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] macosx: advanced prefs: impelent controls for CONFIG_ITEM_MODULE_LIST

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 21:00:19 2014 +0100| [b77c3fdf0ecfc4b6a069a61a73f168470d091cfa] | committer: 
David Fuhrmann

macosx: advanced prefs: impelent controls for CONFIG_ITEM_MODULE_LIST

fixes #7493

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

 modules/gui/macosx/prefs_widgets.m |  107 +---
 1 file changed, 63 insertions(+), 44 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.m 
b/modules/gui/macosx/prefs_widgets.m
index 33bae45..af12405 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -1958,9 +1958,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: 
s_rc] retain]; \
 - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
 {
-if (_p_item-i_type == CONFIG_ITEM_MODULE_LIST)
-//TODO
-return nil;
+BOOL b_by_cat = _p_item-i_type == CONFIG_ITEM_MODULE_LIST_CAT;
 
 //Fill our array to know how may items we have...
 module_t *p_parser, **p_list;
@@ -1979,56 +1977,77 @@ o_textfield = [[[NSSecureTextField alloc] 
initWithFrame: s_rc] retain]; \
 if (module_is_main(p_parser))
 continue;
 
-unsigned int confsize;
-module_config_t *p_configlist = module_config_get(p_parser, confsize);
+if (b_by_cat) {
+unsigned int confsize;
+module_config_t *p_configlist = module_config_get(p_parser, 
confsize);
 
-for (i = 0; i  confsize; i++) {
-unsigned int unused;
-module_config_t *p_config = p_configlist[i];
-NSString *o_modulelongname, *o_modulename;
-NSNumber *o_moduleenabled = nil;
+for (i = 0; i  confsize; i++) {
+unsigned int unused;
+module_config_t *p_config = p_configlist[i];
+NSString *o_modulelongname, *o_modulename;
+NSNumber *o_moduleenabled = nil;
 
-/* Hack: required subcategory is stored in i_min */
-if (p_config-i_type == CONFIG_SUBCATEGORY 
-   p_config-value.i == _p_item-min.i) {
-o_modulelongname = [NSString 
stringWithUTF8String:module_get_name(p_parser, TRUE)];
-o_modulename = [NSString 
stringWithUTF8String:module_get_object(p_parser)];
-
-if (_p_item-value.psz 
-   strstr(_p_item-value.psz, module_get_object(p_parser)))
-o_moduleenabled = [NSNumber numberWithBool:YES];
-else
-o_moduleenabled = [NSNumber numberWithBool:NO];
-
-[o_modulearray addObject:[NSMutableArray
-  arrayWithObjects: o_modulename, 
o_modulelongname,
-  o_moduleenabled, nil]];
-}
+/* Hack: required subcategory is stored in i_min */
+if (p_config-i_type == CONFIG_SUBCATEGORY 
+p_config-value.i == _p_item-min.i) {
 
-/* Parental Advisory HACK:
- * Selecting HTTP, RC and Telnet interfaces is difficult now
- * since they are just the lua interface module */
-if (p_config-i_type == CONFIG_SUBCATEGORY 
-   !strcmp(module_get_object(p_parser), lua) 
-   !strcmp(_p_item-psz_name, extraintf) 
-   p_config-value.i == _p_item-min.i) {
+o_modulelongname = [NSString 
stringWithUTF8String:module_get_name(p_parser, TRUE)];
+o_modulename = [NSString 
stringWithUTF8String:module_get_object(p_parser)];
 
-#define addLuaIntf(shortname, longname) \
-if (_p_item-value.psz  strstr(_p_item-value.psz, 
shortname))\
-o_moduleenabled = [NSNumber numberWithBool:YES];\
-else\
-o_moduleenabled = [NSNumber numberWithBool:NO];\
-[o_modulearray addObject:[NSMutableArray arrayWithObjects: 
@shortname, _NS(longname), o_moduleenabled, nil]]
+if (_p_item-value.psz 
+strstr(_p_item-value.psz, 
module_get_object(p_parser)))
+o_moduleenabled = [NSNumber numberWithBool:YES];
+else
+o_moduleenabled = [NSNumber numberWithBool:NO];
 
-addLuaIntf(http, Web);
-addLuaIntf(telnet, Telnet);
-addLuaIntf(cli, Console);
+[o_modulearray addObject:[NSMutableArray
+  arrayWithObjects: o_modulename, 
o_modulelongname,
+  o_moduleenabled, nil]];
+}
+
+/* Parental Advisory HACK:
+ * Selecting HTTP, RC and Telnet interfaces is difficult now
+ * since they are 

[vlc-commits] macosx: advanced prefs: use string list control for CONFIG_ITEM_MODULE and simplify

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 19:34:22 2014 +0100| [b954a5927defb181d53ce9ab09a8a1d6de76d6ba] | committer: 
David Fuhrmann

macosx: advanced prefs: use string list control for CONFIG_ITEM_MODULE and 
simplify

Uses config_GetPszChoices.

close #8941

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

 modules/gui/macosx/prefs_widgets.m |  131 
 1 file changed, 57 insertions(+), 74 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.m 
b/modules/gui/macosx/prefs_widgets.m
index a3fa441..33bae45 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -783,6 +783,10 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: 
s_rc] retain]; \
 withView: o_parent_view];
 break;
 case CONFIG_ITEM_MODULE:
+p_control = [[StringListConfigControl alloc]
+ initWithItem: _p_item
+ withView: o_parent_view];
+break;
 case CONFIG_ITEM_MODULE_CAT:
 p_control = [[ModuleConfigControl alloc]
 initWithItem: _p_item
@@ -994,7 +998,10 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: 
s_rc] retain]; \
 mainFrame.origin.y = 0;
 
 if ([super initWithFrame: mainFrame item: _p_item] != nil) {
-i_view_type = CONFIG_ITEM_STRING_LIST;
+if (p_item-i_type == CONFIG_ITEM_STRING)
+i_view_type = CONFIG_ITEM_STRING_LIST;
+else
+i_view_type = CONFIG_ITEM_MODULE;
 
 o_textfieldTooltip = [[VLCStringUtility sharedInstance] wrapString: 
_NS(p_item-psz_longtext) toWidth: PREFS_WRAP];
 
@@ -1013,21 +1020,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: 
s_rc] retain]; \
 [o_popup setAutoresizingMask:NSViewWidthSizable];
 
 /* add items */
-for (int i_index = 0; i_index  p_item-list_count; i_index++) {
-NSString *o_text;
-if (p_item-list_text  p_item-list_text[i_index])
-o_text = _NS((char *)p_item-list_text[i_index]);
-else
-o_text = _NS((char *)p_item-list.psz[i_index]);
-[o_popup addItemWithTitle: o_text];
-
-/* select default item */
-if (!p_item-value.psz  !p_item-list.psz[i_index])
-[o_popup selectItemAtIndex: i_index];
-else if (p_item-value.psz  p_item-list.psz[i_index] 
- !strcmp(p_item-value.psz, p_item-list.psz[i_index]))
-[o_popup selectItemAtIndex: i_index];
-}
+[self resetValues];
 
 [self addSubview: o_popup];
 }
@@ -1056,27 +1049,41 @@ o_textfield = [[[NSSecureTextField alloc] 
initWithFrame: s_rc] retain]; \
 
 - (char *)stringValue
 {
-if ([o_popup indexOfSelectedItem] = 0) {
-if (p_item-list.psz[[o_popup indexOfSelectedItem]] != NULL)
-return strdup(p_item-list.psz[[o_popup indexOfSelectedItem]]);
-}
+if ([o_popup indexOfSelectedItem]  0)
+return NULL;
 
-return NULL;
+NSString *o_data = [[o_popup selectedItem] representedObject];
+return strdup([o_data UTF8String]);
 }
 
 - (void)resetValues
 {
+[o_popup removeAllItems];
+
 char *psz_value = config_GetPsz(VLCIntf, p_item-psz_name);
 
-for (int i_index = 0; i_index  p_item-list_count; i_index++) {
-if (!psz_value  !p_item-list.psz[i_index])
-[o_popup selectItemAtIndex: i_index];
-else if (psz_value  p_item-list.psz[i_index] 
-!strcmp(psz_value, p_item-list.psz[i_index]))
-[o_popup selectItemAtIndex: i_index];
+char **values, **texts;
+ssize_t count = config_GetPszChoices(VLC_OBJECT(VLCIntf), p_item-psz_name,
+ values, texts);
+for (ssize_t i = 0; i  count  texts; i++) {
+if (texts[i] == NULL || values[i] == NULL)
+continue;
+
+[o_popup addItemWithTitle: toNSStr(texts[i])];
+NSMenuItem *lastItem = [o_popup lastItem];
+[lastItem setRepresentedObject: toNSStr(values[i])];
+
+if (!strcmp(psz_value ? psz_value : , values[i]))
+[o_popup selectItem: [o_popup lastItem]];
+
+free(texts[i]);
+free(values[i]);
 }
+free(texts);
+free(values);
 
 free(psz_value);
+
 [super resetValues];
 }
 @end
@@ -1253,32 +1260,22 @@ o_textfield = [[[NSSecureTextField alloc] 
initWithFrame: s_rc] retain]; \
 for (i_module_index = 0; i_module_index  count; i_module_index++) {
 p_parser = p_list[i_module_index];
 
-if (p_item-i_type == CONFIG_ITEM_MODULE) {
-if (module_provides(p_parser, p_item-psz_type)) {
+if (module_is_main(p_parser))
+continue;
+
+unsigned int confsize;
+module_config_t *p_config = module_config_get(p_parser, confsize);
+   

[vlc-commits] macosx: simple prefs: merge module list into string list and simplify

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 19:35:41 2014 +0100| [dad64d35ac4d3b89b06565f1363219f8810a69ad] | committer: 
David Fuhrmann

macosx: simple prefs: merge module list into string list and simplify

Uses config_GetPszChoices.

Fixes bug where explicit selection of macosx vout module did not worked.

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

 modules/gui/macosx/simple_prefs.m |  119 -
 1 file changed, 37 insertions(+), 82 deletions(-)

diff --git a/modules/gui/macosx/simple_prefs.m 
b/modules/gui/macosx/simple_prefs.m
index 387873d..1c7b54f 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -450,28 +450,47 @@ static inline char * __config_GetLabel(vlc_object_t 
*p_this, const char *psz_nam
 
 [object removeAllItems];
 p_item = config_FindConfig(VLC_OBJECT(p_intf), name);
-
 /* serious problem, if no item found */
 assert(p_item);
 
-for (int i = 0; i  p_item-list_count; i++) {
-NSMenuItem *mi;
-if (p_item-list_text != NULL)
-mi = [[NSMenuItem alloc] initWithTitle: _NS(p_item-list_text[i]) 
action:NULL keyEquivalent: @];
-else if (p_item-list.psz[i]  strcmp(p_item-list.psz[i],) == 0) {
-[[object menu] addItem: [NSMenuItem separatorItem]];
+char **values, **texts;
+ssize_t count = config_GetPszChoices(VLC_OBJECT(VLCIntf), name,
+ values, texts);
+if (count  0) {
+msg_Err(p_intf, Cannot get choices for %s, name);
+return;
+}
+for (ssize_t i = 0; i  count  texts; i++) {
+if (texts[i] == NULL || values[i] == NULL)
 continue;
+
+if (strcmp(texts[i], ) != 0) {
+NSMenuItem *mi = [[NSMenuItem alloc] initWithTitle: 
toNSStr(texts[i]) action: NULL keyEquivalent: @];
+[mi setRepresentedObject: toNSStr(values[i])];
+[[object menu] addItem: [mi autorelease]];
+
+if (p_item-value.psz  !strcmp(p_item-value.psz, values[i]))
+[object selectItem: [object lastItem]];
+
+} else {
+[[object menu] addItem: [NSMenuItem separatorItem]];
 }
-else if (p_item-list.psz[i])
-mi = [[NSMenuItem alloc] initWithTitle: [NSString 
stringWithUTF8String:p_item-list.psz[i]] action:NULL keyEquivalent: @];
-else
-msg_Err(p_intf, item %d of pref %s failed to be created, i, 
name);
-[mi setRepresentedObject:[NSString 
stringWithUTF8String:p_item-list.psz[i]]];
-[[object menu] addItem: [mi autorelease]];
-if (p_item-value.psz  !strcmp(p_item-value.psz, 
p_item-list.psz[i]))
-[object selectItem:[object lastItem]];
+
+free(texts[i]);
+free(values[i]);
 }
-[object setToolTip: _NS(p_item-psz_longtext)];
+
+free(texts);
+free(values);
+
+if (p_item-psz_longtext)
+[object setToolTip: _NS(p_item-psz_longtext)];
+}
+
+// just for clarification that this is a module list
+- (void)setupButton: (NSPopUpButton *)object forModuleList: (const char *)name
+{
+[self setupButton: object forStringList: name];
 }
 
 - (void)setupButton: (NSPopUpButton *)object forIntList: (const char *)name
@@ -500,36 +519,6 @@ static inline char * __config_GetLabel(vlc_object_t 
*p_this, const char *psz_nam
 [object setToolTip: _NS(p_item-psz_longtext)];
 }
 
-- (void)setupButton: (NSPopUpButton *)object forModuleList: (const char *)name
-{
-module_config_t *p_item;
-module_t *p_parser, **p_list;
-int y = 0;
-
-[object removeAllItems];
-
-p_item = config_FindConfig(VLC_OBJECT(p_intf), name);
-size_t count;
-p_list = module_list_get(count);
-if (!p_item ||!p_list) {
-if (p_list) module_list_free(p_list);
-msg_Err(p_intf, serious problem, item or list not found);
-return;
-}
-
-[object addItemWithTitle: _NS(Default)];
-for (size_t i_index = 0; i_index  count; i_index++) {
-p_parser = p_list[i_index];
-if (module_provides(p_parser, p_item-psz_type)) {
-[object addItemWithTitle: [NSString 
stringWithUTF8String:_(module_GetLongName(p_parser)) ?: ]];
-if (p_item-value.psz  !strcmp(p_item-value.psz, 
module_get_name(p_parser, false)))
-[object selectItem: [object lastItem]];
-}
-}
-module_list_free(p_list);
-[object setToolTip: _NS(p_item-psz_longtext)];
-}
-
 - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name
 {
 [object setState: config_GetInt(p_intf, name)];
@@ -890,42 +879,9 @@ static inline void save_int_list(intf_thread_t * p_intf, 
id object, const char *
 static inline void save_string_list(intf_thread_t * p_intf, id object, const 
char * name)
 {
 NSString *p_stringobject;
-module_config_t *p_item;
-p_item = 

[vlc-commits] macosx: advanced prefs: implement controls for CONFIG_ITEM_MODULE_LIST

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 21:00:19 2014 +0100| [65a983cf2d01d5a7aff81149af425a8164d0cfa0] | committer: 
David Fuhrmann

macosx: advanced prefs: implement controls for CONFIG_ITEM_MODULE_LIST

fixes #7493

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65a983cf2d01d5a7aff81149af425a8164d0cfa0
---

 modules/gui/macosx/prefs_widgets.m |  107 +---
 1 file changed, 63 insertions(+), 44 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.m 
b/modules/gui/macosx/prefs_widgets.m
index 33bae45..af12405 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -1958,9 +1958,7 @@ o_textfield = [[[NSSecureTextField alloc] initWithFrame: 
s_rc] retain]; \
 - (id) initWithItem: (module_config_t *)_p_item
withView: (NSView *)o_parent_view
 {
-if (_p_item-i_type == CONFIG_ITEM_MODULE_LIST)
-//TODO
-return nil;
+BOOL b_by_cat = _p_item-i_type == CONFIG_ITEM_MODULE_LIST_CAT;
 
 //Fill our array to know how may items we have...
 module_t *p_parser, **p_list;
@@ -1979,56 +1977,77 @@ o_textfield = [[[NSSecureTextField alloc] 
initWithFrame: s_rc] retain]; \
 if (module_is_main(p_parser))
 continue;
 
-unsigned int confsize;
-module_config_t *p_configlist = module_config_get(p_parser, confsize);
+if (b_by_cat) {
+unsigned int confsize;
+module_config_t *p_configlist = module_config_get(p_parser, 
confsize);
 
-for (i = 0; i  confsize; i++) {
-unsigned int unused;
-module_config_t *p_config = p_configlist[i];
-NSString *o_modulelongname, *o_modulename;
-NSNumber *o_moduleenabled = nil;
+for (i = 0; i  confsize; i++) {
+unsigned int unused;
+module_config_t *p_config = p_configlist[i];
+NSString *o_modulelongname, *o_modulename;
+NSNumber *o_moduleenabled = nil;
 
-/* Hack: required subcategory is stored in i_min */
-if (p_config-i_type == CONFIG_SUBCATEGORY 
-   p_config-value.i == _p_item-min.i) {
-o_modulelongname = [NSString 
stringWithUTF8String:module_get_name(p_parser, TRUE)];
-o_modulename = [NSString 
stringWithUTF8String:module_get_object(p_parser)];
-
-if (_p_item-value.psz 
-   strstr(_p_item-value.psz, module_get_object(p_parser)))
-o_moduleenabled = [NSNumber numberWithBool:YES];
-else
-o_moduleenabled = [NSNumber numberWithBool:NO];
-
-[o_modulearray addObject:[NSMutableArray
-  arrayWithObjects: o_modulename, 
o_modulelongname,
-  o_moduleenabled, nil]];
-}
+/* Hack: required subcategory is stored in i_min */
+if (p_config-i_type == CONFIG_SUBCATEGORY 
+p_config-value.i == _p_item-min.i) {
 
-/* Parental Advisory HACK:
- * Selecting HTTP, RC and Telnet interfaces is difficult now
- * since they are just the lua interface module */
-if (p_config-i_type == CONFIG_SUBCATEGORY 
-   !strcmp(module_get_object(p_parser), lua) 
-   !strcmp(_p_item-psz_name, extraintf) 
-   p_config-value.i == _p_item-min.i) {
+o_modulelongname = [NSString 
stringWithUTF8String:module_get_name(p_parser, TRUE)];
+o_modulename = [NSString 
stringWithUTF8String:module_get_object(p_parser)];
 
-#define addLuaIntf(shortname, longname) \
-if (_p_item-value.psz  strstr(_p_item-value.psz, 
shortname))\
-o_moduleenabled = [NSNumber numberWithBool:YES];\
-else\
-o_moduleenabled = [NSNumber numberWithBool:NO];\
-[o_modulearray addObject:[NSMutableArray arrayWithObjects: 
@shortname, _NS(longname), o_moduleenabled, nil]]
+if (_p_item-value.psz 
+strstr(_p_item-value.psz, 
module_get_object(p_parser)))
+o_moduleenabled = [NSNumber numberWithBool:YES];
+else
+o_moduleenabled = [NSNumber numberWithBool:NO];
 
-addLuaIntf(http, Web);
-addLuaIntf(telnet, Telnet);
-addLuaIntf(cli, Console);
+[o_modulearray addObject:[NSMutableArray
+  arrayWithObjects: o_modulename, 
o_modulelongname,
+  o_moduleenabled, nil]];
+}
+
+/* Parental Advisory HACK:
+ * Selecting HTTP, RC and Telnet interfaces is difficult now
+ * since they are 

[vlc-commits] macosx: advanced prefs: remove scroll view from module list table view, fix layout

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 21:42:10 2014 +0100| [7dd80de5601ff0b85dfa3e0db9be9d69a2bfa1f5] | committer: 
David Fuhrmann

macosx: advanced prefs: remove scroll view from module list table view, fix 
layout

close #9971

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7dd80de5601ff0b85dfa3e0db9be9d69a2bfa1f5
---

 modules/gui/macosx/prefs_widgets.m |  101 
 1 file changed, 46 insertions(+), 55 deletions(-)

diff --git a/modules/gui/macosx/prefs_widgets.m 
b/modules/gui/macosx/prefs_widgets.m
index af12405..bd800b8 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -2050,7 +2050,51 @@ else\
 } /* FOR i_module_index */
 module_list_free(p_list);
 
-mainFrame.size.height = 30 + 20 * [o_modulearray count];
+
+// First, initialize and draw the table view to get its height
+NSRect s_rc = NSMakeRect(12, 10, mainFrame.size.width - LEFTMARGIN - 
RIGHTMARGIN, 50);
+// height is automatically increased as needed
+NSTableView *o_tableview;
+o_tableview = [[NSTableView alloc] initWithFrame : s_rc];
+[o_tableview setUsesAlternatingRowBackgroundColors:YES];
+[o_tableview setHeaderView:nil];
+/* FIXME: support for multiple selection... */
+//[o_tableview setAllowsMultipleSelection:YES];
+
+NSCell *o_headerCell = [[NSCell alloc] initTextCell:@Enabled];
+NSCell *o_dataCell = [[NSButtonCell alloc] init];
+[(NSButtonCell*)o_dataCell setButtonType:NSSwitchButton];
+[o_dataCell setTitle:@];
+[o_dataCell setFont:[NSFont systemFontOfSize:0]];
+NSTableColumn *o_tableColumn = [[NSTableColumn alloc]
+initWithIdentifier:@Enabled];
+[o_tableColumn setHeaderCell: o_headerCell];
+[o_tableColumn setDataCell: o_dataCell];
+[o_tableColumn setWidth:17];
+[o_tableview addTableColumn: o_tableColumn];
+
+o_headerCell = [[NSCell alloc] initTextCell:@Module Name];
+o_dataCell = [[NSTextFieldCell alloc] init];
+[o_dataCell setFont:[NSFont systemFontOfSize:12]];
+o_tableColumn = [[NSTableColumn alloc]
+ initWithIdentifier:@Module];
+[o_tableColumn setHeaderCell: o_headerCell];
+[o_tableColumn setDataCell: o_dataCell];
+[o_tableColumn setWidth:s_rc.size.width - 34];
+[o_tableview addTableColumn: o_tableColumn];
+[o_tableview registerForDraggedTypes:[NSArray arrayWithObject:@VLC media 
player module]];
+
+[o_tableview setDataSource:self];
+[o_tableview setTarget: self];
+[o_tableview setAction: @selector(tableChanged:)];
+[o_tableview sendActionOn:NSLeftMouseUpMask | NSLeftMouseDownMask |
+ NSLeftMouseDraggedMask];
+
+[o_tableview reloadData];
+
+CGFloat tableview_height = [o_tableview frame].size.height;
+
+mainFrame.size.height = 40 + tableview_height;
 mainFrame.size.width = mainFrame.size.width - LEFTMARGIN - RIGHTMARGIN;
 mainFrame.origin.x = LEFTMARGIN;
 mainFrame.origin.y = 0;
@@ -2079,60 +2123,7 @@ else\
 [o_textfield setAutoresizingMask:NSViewWidthSizable ];
 [self addSubview: o_textfield];
 
-
-{
-NSRect s_rc = mainFrame;
-s_rc.size.height = mainFrame.size.height - 30;
-s_rc.size.width = mainFrame.size.width - 12;
-s_rc.origin.x = 12;
-s_rc.origin.y = 0;
-o_scrollview = [[[NSScrollView alloc] initWithFrame: s_rc] retain];
-[o_scrollview setDrawsBackground: NO];
-[o_scrollview setBorderType: NSBezelBorder];
-[o_scrollview setAutohidesScrollers:YES];
-
-NSTableView *o_tableview;
-o_tableview = [[NSTableView alloc] initWithFrame : s_rc];
-[o_tableview setUsesAlternatingRowBackgroundColors:YES];
-[o_tableview setHeaderView:nil];
-/* TODO: find a good way to fix the row height and text size*/
-/* FIXME: support for multiple selection... */
-//[o_tableview setAllowsMultipleSelection:YES];
-
-NSCell *o_headerCell = [[NSCell alloc] initTextCell:@Enabled];
-NSCell *o_dataCell = [[NSButtonCell alloc] init];
-[(NSButtonCell*)o_dataCell setButtonType:NSSwitchButton];
-[o_dataCell setTitle:@];
-[o_dataCell setFont:[NSFont systemFontOfSize:0]];
-NSTableColumn *o_tableColumn = [[NSTableColumn alloc]
-initWithIdentifier:@Enabled];
-[o_tableColumn setHeaderCell: o_headerCell];
-[o_tableColumn setDataCell: o_dataCell];
-[o_tableColumn setWidth:17];
-[o_tableview addTableColumn: o_tableColumn];
-
-o_headerCell = [[NSCell alloc] initTextCell:@Module Name];
-o_dataCell = [[NSTextFieldCell alloc] init];
-[o_dataCell setFont:[NSFont systemFontOfSize:12]];
-o_tableColumn = 

[vlc-commits] macosx: advanced prefs: fix width of table view

2014-01-18 Thread David Fuhrmann
vlc | branch: master | David Fuhrmann david.fuhrm...@googlemail.com | Sat Jan 
18 23:22:25 2014 +0100| [302ffe2e61704ba514402b7b015e6709540973fd] | committer: 
David Fuhrmann

macosx: advanced prefs: fix width of table view

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=302ffe2e61704ba514402b7b015e6709540973fd
---

 modules/gui/macosx/prefs_widgets.m |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/macosx/prefs_widgets.m 
b/modules/gui/macosx/prefs_widgets.m
index bd800b8..fb8fec4 100644
--- a/modules/gui/macosx/prefs_widgets.m
+++ b/modules/gui/macosx/prefs_widgets.m
@@ -2052,7 +2052,7 @@ else\
 
 
 // First, initialize and draw the table view to get its height
-NSRect s_rc = NSMakeRect(12, 10, mainFrame.size.width - LEFTMARGIN - 
RIGHTMARGIN, 50);
+NSRect s_rc = NSMakeRect(12, 10, mainFrame.size.width - LEFTMARGIN - 
RIGHTMARGIN - 12, 50);
 // height is automatically increased as needed
 NSTableView *o_tableview;
 o_tableview = [[NSTableView alloc] initWithFrame : s_rc];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Japanese update

2014-01-18 Thread Fumio Nakayama
vlc/vlc-2.1 | branch: master | Fumio Nakayama fumio@gmail.com | Sat Jan 
18 23:03:08 2014 +0100| [8dae315fd4ba6fb204fcab763f04566f0d50497f] | committer: 
Christoph Miebach

l10n: Japanese update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=8dae315fd4ba6fb204fcab763f04566f0d50497f
---

 po/ja.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 9b80d71..99f0c57 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-10-07 13:45+\n
+PO-Revision-Date: 2013-12-12 16:26+\n
 Last-Translator: Fumio Nakayama fumio@gmail.com\n
 Language-Team: Japanese (http://www.transifex.com/projects/p/vlc-trans/;
 language/ja/)\n
@@ -18274,9 +18274,8 @@ msgid Lua HTTP
 msgstr Lua HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr VLCの再生中はiTunesを一時停止
+msgstr 再生中のiTunes制御
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -29159,9 +29158,6 @@ msgstr ; 
 msgid Media Manager List
 msgstr メディアマネージャーリスト
 
-#~ msgid Show Details
-#~ msgstr 詳細を表示
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -31056,6 +31052,10 @@ msgstr メディアマネージャーリスト
 #~ msgstr iSigntキャプチャー入力
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr コーデックの詳細
+
+#, fuzzy
 #~ msgid Add a subtitle file
 #~ msgstr 字幕ファイルを使用 (T)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Finnish update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
22:43:25 2014 +0100| [a66b30b97a6d66ad67bd96b9db0300c9ee084601] | committer: 
Christoph Miebach

l10n: Finnish update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=a66b30b97a6d66ad67bd96b9db0300c9ee084601
---

 po/fi.po | 8487 +++---
 1 file changed, 4267 insertions(+), 4220 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=a66b30b97a6d66ad67bd96b9db0300c9ee084601
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Galician update

2014-01-18 Thread Gonçalo Cordeiro
vlc/vlc-2.1 | branch: master | Gonçalo Cordeiro gzcorde...@gmail.com | Sat 
Jan 18 22:50:20 2014 +0100| [4b4ebfef44b5b7ddab0ed01d8c40d7454420198b] | 
committer: Christoph Miebach

l10n: Galician update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=4b4ebfef44b5b7ddab0ed01d8c40d7454420198b
---

 po/gl.po |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/po/gl.po b/po/gl.po
index 39c66a3..1710e26 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,13 +5,14 @@
 # Translators:
 # Gonçalo Cordeiro gzcorde...@gmail.com, 2009-2013
 # Iván Seoane Pardo ivam...@gmail.com, 2008
+# Iván Seoane Pardo ivam...@gmail.com, 2008.\nPaula Iglesias 
localizac...@tagenata.com, 2009
 # Paula Iglesias localizac...@tagenata.com, 2009
 msgid 
 msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-22 09:47+\n
+PO-Revision-Date: 2013-12-08 09:46+\n
 Last-Translator: Gonçalo Cordeiro gzcorde...@gmail.com\n
 Language-Team: Galician (http://www.transifex.com/projects/p/vlc-trans/;
 language/gl/)\n
@@ -18583,9 +18584,8 @@ msgid Lua HTTP
 msgstr HTTP Lua
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr Pór en pausa o iTunes durante a reprodución co VLC
+msgstr Controlar o iTunes durante a reprodución
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -29615,9 +29615,6 @@ msgstr ; 
 msgid Media Manager List
 msgstr Lista do xestor multimedia
 
-#~ msgid Show Details
-#~ msgstr Mostrar detalles
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -31621,6 +31618,10 @@ msgstr Lista do xestor multimedia
 #~ msgstr Entrada de capturas iSight
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr Detalles do códec
+
+#, fuzzy
 #~ msgid Add a subtitle file
 #~ msgstr Usar un ficheiro de subtítulos
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Nepali update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
23:22:04 2014 +0100| [ed337acea58ccc77950150b3ca14aeda54a61f30] | committer: 
Christoph Miebach

l10n: Nepali update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ed337acea58ccc77950150b3ca14aeda54a61f30
---

 po/ne.po |14281 +++---
 1 file changed, 6111 insertions(+), 8170 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=ed337acea58ccc77950150b3ca14aeda54a61f30
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Sinhala update

2014-01-18 Thread Pasindu Kavinda
vlc/vlc-2.1 | branch: master | Pasindu Kavinda pkavi...@gmail.com | Sat Jan 
18 23:37:35 2014 +0100| [0391f2bbbc5e6459a24a68131eb334d9c86aa87c] | committer: 
Christoph Miebach

l10n: Sinhala update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=0391f2bbbc5e6459a24a68131eb334d9c86aa87c
---

 po/si.po |   58 +-
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/po/si.po b/po/si.po
index ef9462d..f9bcf4c 100644
--- a/po/si.po
+++ b/po/si.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-11-24 06:09+\n
+PO-Revision-Date: 2013-12-27 15:23+\n
 Last-Translator: Pasindu Kavinda pkavi...@gmail.com\n
 Language-Team: Sinhala (http://www.transifex.com/projects/p/vlc-trans/;
 language/si/)\n
@@ -974,7 +974,7 @@ msgstr මාධ්‍යයේ වාර්තාව
 
 #: src/config/keys.c:96
 msgid Media Repeat
-msgstr 
+msgstr මාධ්‍ය පුනරාවර්තනය
 
 #: src/config/keys.c:97
 msgid Media Rewind
@@ -2077,7 +2077,7 @@ msgstr රේඛීය
 
 #: src/libvlc-module.c:358 modules/video_filter/deinterlace/deinterlace.h:58
 msgid Phosphor
-msgstr 
+msgstr ප්‍රකාශද
 
 #: src/libvlc-module.c:359 modules/video_filter/deinterlace/deinterlace.h:58
 msgid Film NTSC (IVTC)
@@ -3304,7 +3304,7 @@ msgstr VLM ආරම්භ වන්නේ නම්, VLM වින්‍යා
 
 #: src/libvlc-module.c:1037
 msgid Use a plugins cache
-msgstr පේණු මෘදුකාංග කෑෂ් භාවිතා කරන්න
+msgstr ප්ලගීන හැඹිලිය භාවිතා කරන්න
 
 #: src/libvlc-module.c:1039
 msgid Use a plugins cache which will greatly improve the startup time of VLC.
@@ -4366,7 +4366,7 @@ msgstr උපසිරැසි
 
 #: src/libvlc-module.c:1660 modules/stream_out/transcode/transcode.c:115
 msgid Overlays
-msgstr 
+msgstr වසාලන
 
 #: src/libvlc-module.c:1670
 msgid Track settings
@@ -4475,7 +4475,7 @@ msgstr විකල්ප වින්‍යාස ගොනුවක් භා
 
 #: src/libvlc-module.c:2652
 msgid resets the current plugins cache
-msgstr 
+msgstr වත්මන් ප්ලගීන හැඹිලිය යළි සකස් කරයි
 
 #: src/libvlc-module.c:2654
 msgid print version information
@@ -4818,7 +4818,7 @@ msgstr Manx
 
 #: src/text/iso-639_def.h:87
 msgid Greek, Modern
-msgstr 
+msgstr ග්‍රීක, නවීන
 
 #: src/text/iso-639_def.h:88
 msgid Guarani
@@ -5996,15 +5996,15 @@ msgstr 
 
 #: modules/access/dtv/access.c:97
 msgid Layer A code rate
-msgstr 
+msgstr A ස්ථරයේ කේත අනුපාතය
 
 #: modules/access/dtv/access.c:98
 msgid Layer B code rate
-msgstr 
+msgstr B ස්ථරයේ කේත අනුපාතය
 
 #: modules/access/dtv/access.c:99
 msgid Layer C code rate
-msgstr 
+msgstr C ස්ථරයේ කේත අනුපාතය
 
 #: modules/access/dtv/access.c:101
 msgid The code rate for Forward Error Correction can be specified.
@@ -6114,7 +6114,7 @@ msgstr 
 
 #: modules/access/dtv/access.c:171
 msgid Unspecified (0V)
-msgstr 
+msgstr විශේෂණය නොකල (0V)
 
 #: modules/access/dtv/access.c:172
 msgid Vertical (13V)
@@ -6181,7 +6181,7 @@ msgstr 
 
 #: modules/access/dtv/access.c:197
 msgid DiSEqC LNB number
-msgstr 
+msgstr DiSEqC LNB අංකය
 
 #: modules/access/dtv/access.c:199
 msgid 
@@ -7109,7 +7109,7 @@ msgstr පවත්නා ගොනුව තබාගන්න
 
 #: modules/access_output/file.c:204
 msgid Overwrite
-msgstr 
+msgstr උඩින් ලියන්න
 
 #: modules/access_output/http.c:51 modules/access/vnc.c:46
 #: modules/misc/audioscrobbler.c:114 modules/stream_out/rtp.c:177
@@ -7173,7 +7173,7 @@ msgstr 
 
 #: modules/access_output/livehttp.c:79
 msgid Allow cache
-msgstr 
+msgstr හැඹිලියට ඉඩදෙන්න
 
 #: modules/access_output/livehttp.c:80
 msgid Add EXT-X-ALLOW-CACHE:NO directive in playlist-file if this is disabled
@@ -7213,7 +7213,7 @@ msgstr 
 
 #: modules/access_output/livehttp.c:96
 msgid AES key file
-msgstr 
+msgstr AES යතුරු ගොනුව
 
 #: modules/access_output/livehttp.c:97
 msgid File containing the 16 bytes encryption key
@@ -7285,7 +7285,7 @@ msgstr 
 
 #: modules/access_output/shout.c:85
 msgid URL description
-msgstr 
+msgstr URL විස්තරය
 
 #: modules/access_output/shout.c:86
 msgid URL with information about the stream or your channel. 
@@ -7328,7 +7328,7 @@ msgstr 
 
 #: modules/access_output/shout.c:111
 msgid IceCAST output
-msgstr 
+msgstr IceCAST ප්‍රතිදානය
 
 #: modules/access_output/udp.c:64 modules/stream_out/rtp.c:139
 msgid Caching value (ms)
@@ -7413,7 +7413,7 @@ msgstr 
 
 #: modules/access/rdp.c:51
 msgid RDP Password
-msgstr 
+msgstr RDP මුරපදය
 
 #: modules/access/rdp.c:52
 msgid Encrypted connexion
@@ -10927,14 +10927,14 @@ msgstr 
 
 #: modules/codec/libass.c:225 modules/text_renderer/freetype.c:499
 msgid Building font cache
-msgstr  font cache මතකය ගොඩනංවමින්...
+msgstr අක්ෂර හැඹිලිය ගොඩනංවමින්
 
 #: modules/codec/libass.c:226
 msgid 
 Please wait while your font cache is rebuilt.\n
 This should take less than a minute.
 msgstr 
-VLC විසින් ඔබගේ පරිගණකයේ font cache යළි සකස් කරන තුරු මදක් රැඳී සිටින්න\n
+කරුණාකර ඔබගේ අක්ෂර හැඹිලිය නැවත සාදන තුරු මදක් රැඳී සිටින්න.\n
 මේ සඳහා මිනිත්තු කිහිපයකට අඩු වේලාවක් ගත වනු ඇත.
 
 #: 

[vlc-commits] l10n: Hebrew update

2014-01-18 Thread Yaron Shahrabani
vlc/vlc-2.1 | branch: master | Yaron Shahrabani sh.ya...@gmail.com | Sat Jan 
18 22:51:41 2014 +0100| [2f12cb427d0acb5c06be43c6c9bc075875489f96] | committer: 
Christoph Miebach

l10n: Hebrew update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=2f12cb427d0acb5c06be43c6c9bc075875489f96
---

 po/he.po |  497 +-
 1 file changed, 268 insertions(+), 229 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=2f12cb427d0acb5c06be43c6c9bc075875489f96
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Portuguese update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
23:31:11 2014 +0100| [b66e58ef324b3f60730325f16f59674981aff442] | committer: 
Christoph Miebach

l10n: Portuguese update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b66e58ef324b3f60730325f16f59674981aff442
---

 po/pt_PT.po | 6504 +++
 1 file changed, 3924 insertions(+), 2580 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=b66e58ef324b3f60730325f16f59674981aff442
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: French update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
22:48:27 2014 +0100| [b1194bd906fff8db3ab3ab04d72db55b185ab71f] | committer: 
Christoph Miebach

l10n: French update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b1194bd906fff8db3ab3ab04d72db55b185ab71f
---

 po/fr.po |   89 --
 1 file changed, 64 insertions(+), 25 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=b1194bd906fff8db3ab3ab04d72db55b185ab71f
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Slovenian update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
23:40:34 2014 +0100| [85878a9fdcacd26d140c6b5582fff4be892455c9] | committer: 
Christoph Miebach

l10n: Slovenian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=85878a9fdcacd26d140c6b5582fff4be892455c9
---

 po/sl.po |  220 --
 1 file changed, 113 insertions(+), 107 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=85878a9fdcacd26d140c6b5582fff4be892455c9
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Scottish Gaelic update

2014-01-18 Thread Michael Bauer
vlc/vlc-2.1 | branch: master | Michael Bauer f...@akerbeltz.org | Sat Jan 18 
22:49:18 2014 +0100| [57ea97ebca0ad9ec54b4315c98a0d77d5598556d] | committer: 
Christoph Miebach

l10n: Scottish Gaelic update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=57ea97ebca0ad9ec54b4315c98a0d77d5598556d
---

 po/gd.po |   51 +--
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/po/gd.po b/po/gd.po
index 014daa4..610da06 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
-# Michael Bauer f...@akerbeltz.org, 2012-2013
+# Michael Bauer f...@akerbeltz.org, 2012-2014
 msgid 
 msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-11-11 23:50+\n
+PO-Revision-Date: 2014-01-08 21:06+\n
 Last-Translator: Michael Bauer f...@akerbeltz.org\n
 Language-Team: Gaelic, Scottish (http://www.transifex.com/projects/p/vlc-;
 trans/language/gd/)\n
@@ -6119,7 +6119,7 @@ msgstr 
 
 #: modules/access/dtv/access.c:124
 msgid 10 MHz
-msgstr 
+msgstr 10 MHz
 
 #: modules/access/dtv/access.c:124
 msgid 8 MHz
@@ -17286,9 +17286,8 @@ msgid Lua HTTP
 msgstr Lua HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr Cuir iTunes 'na stad nuair a tha VLC a' cluich rud
+msgstr 
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -21561,7 +21560,7 @@ msgstr 
 
 #: modules/mux/ogg.c:51
 msgid Ogg/OGM muxer
-msgstr 
+msgstr Ogg/OGM muxer
 
 #: modules/mux/wav.c:46
 msgid WAV muxer
@@ -21835,20 +21834,20 @@ msgstr Desktop
 #: modules/stream_filter/dash/dash.cpp:51
 #: modules/stream_filter/dash/dash.cpp:52
 msgid Preferred Width
-msgstr 
+msgstr An leud as fhearr leat
 
 #: modules/stream_filter/dash/dash.cpp:54
 #: modules/stream_filter/dash/dash.cpp:55
 msgid Preferred Height
-msgstr 
+msgstr An àirde as fhearr leat
 
 #: modules/stream_filter/dash/dash.cpp:57
 msgid Buffer Size (Seconds)
-msgstr 
+msgstr Meud a' bhufair (ann an diogan)
 
 #: modules/stream_filter/dash/dash.cpp:58
 msgid Buffer size in seconds
-msgstr 
+msgstr Meud a' bhufair ann an diogan
 
 #: modules/stream_filter/dash/dash.cpp:61
 msgid DASH
@@ -21860,15 +21859,15 @@ msgstr 
 
 #: modules/stream_filter/decomp.c:59
 msgid LZMA decompression
-msgstr 
+msgstr Dì-dhùmhlachadh LZMA
 
 #: modules/stream_filter/decomp.c:63
 msgid Burrows-Wheeler decompression
-msgstr 
+msgstr Dì-dhùmhlachadh Burrows-Wheeler
 
 #: modules/stream_filter/decomp.c:68
 msgid gzip decompression
-msgstr 
+msgstr Dì-dhùmhlachadh gzip
 
 #: modules/stream_filter/httplive.c:55
 msgid Http Live Streaming stream filter
@@ -21880,11 +21879,11 @@ msgstr 
 
 #: modules/stream_filter/smooth/smooth.c:61
 msgid Smooth Streaming
-msgstr 
+msgstr Sruthadh rèidh
 
 #: modules/stream_out/autodel.c:46
 msgid Autodel
-msgstr 
+msgstr Autodel
 
 #: modules/stream_out/autodel.c:47
 msgid Automatically add/delete input streams
@@ -21915,7 +21914,7 @@ msgstr 
 
 #: modules/stream_out/bridge.c:56
 msgid ID Offset
-msgstr 
+msgstr ID Offset
 
 #: modules/stream_out/bridge.c:57
 msgid 
@@ -22125,7 +22124,7 @@ msgstr 
 
 #: modules/stream_out/langfromtelx.c:45
 msgid Magazine
-msgstr 
+msgstr Iris
 
 #: modules/stream_out/langfromtelx.c:47
 msgid Specify the magazine containing the language page
@@ -22133,7 +22132,7 @@ msgstr 
 
 #: modules/stream_out/langfromtelx.c:48
 msgid Page
-msgstr 
+msgstr Duilleag
 
 #: modules/stream_out/langfromtelx.c:50
 msgid Specify the page containing the language
@@ -22141,7 +22140,7 @@ msgstr 
 
 #: modules/stream_out/langfromtelx.c:51
 msgid Row
-msgstr 
+msgstr Ràgh
 
 #: modules/stream_out/langfromtelx.c:53
 msgid Specify the row containing the language
@@ -24796,7 +24795,7 @@ msgstr 
 
 #: modules/video_filter/opencv_wrapper.c:62
 msgid RGB32
-msgstr 
+msgstr RGB32
 
 #: modules/video_filter/opencv_wrapper.c:65
 msgid Don't display any video
@@ -25750,11 +25749,11 @@ msgstr Iompachair YUVP
 
 #: modules/video_output/aa.c:56
 msgid ASCII Art
-msgstr 
+msgstr Ealain ASCII
 
 #: modules/video_output/aa.c:59
 msgid ASCII-art video output
-msgstr 
+msgstr Às-chur video ealain ASCII
 
 #: modules/video_output/androidsurface.c:49 modules/video_output/yuv.c:44
 msgid Chroma used
@@ -26314,19 +26313,19 @@ msgstr 
 
 #: modules/video_output/yuv.c:59
 msgid YUV output
-msgstr 
+msgstr Às-chur YUV
 
 #: modules/video_output/yuv.c:60
 msgid YUV video output
-msgstr 
+msgstr Às-chur video YUV
 
 #: modules/visualization/goom.c:45
 msgid Goom display width
-msgstr 
+msgstr Leud an taisbeanaidh Goom
 
 #: modules/visualization/goom.c:46
 msgid Goom display height
-msgstr 
+msgstr Àirde an taisbeanaidh Goom
 
 #: modules/visualization/goom.c:47
 msgid 

___

[vlc-commits] l10n: Modern Greek update

2014-01-18 Thread Savvas Nesseris
vlc/vlc-2.1 | branch: master | Savvas Nesseris 
modernphilosopher82-2...@yahoo.com | Sat Jan 18 22:32:10 2014 +0100| 
[d59620a8740674ddf3c41bc9f4e61a2a7ca7ab73] | committer: Christoph Miebach

l10n: Modern Greek update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=d59620a8740674ddf3c41bc9f4e61a2a7ca7ab73
---

 po/el.po |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/po/el.po b/po/el.po
index 75a876f..fd591c0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
+# mstefanis mstefa...@hotmail.com, 2013
 # jopo146 johnponti...@yahoo.gr, 2013
 # kolokotronis modernphilosopher82-2...@yahoo.com, 2013
 # Manolis Stefanis mstefa...@hotmail.com 2012, 2013
@@ -12,8 +13,8 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-23 08:47+\n
-Last-Translator: mstefanis mstefa...@hotmail.com\n
+PO-Revision-Date: 2013-12-09 22:02+\n
+Last-Translator: kolokotronis modernphilosopher82-2...@yahoo.com\n
 Language-Team: Greek (http://www.transifex.com/projects/p/vlc-trans/language/;
 el/)\n
 Language: el\n
@@ -18818,9 +18819,8 @@ msgid Lua HTTP
 msgstr HTTP του lua
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr Παύση του iTunes κατά τη διάρκεια της αναπαραγωγής του VLC
+msgstr Έλεγχος του iTunes κατά την αναπαραγωγή
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -3,9 +3,6 @@ msgstr ;
 msgid Media Manager List
 msgstr Λίστα διαχειριστή πολυμέσων
 
-#~ msgid Show Details
-#~ msgstr Προβολή λεπτομερειών
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -32780,6 +32777,10 @@ msgstr Λίστα διαχειριστή πολυμέσων
 #~ msgstr Αποθήκευση έντασης κατά την έξοδο
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr Λεπτομέρειες Codec
+
+#, fuzzy
 #~ msgid Enqueue files when in one instance mode
 #~ msgstr 
 #~ Τοποθετήστε αντικείμενα στην ουρά της λίστας αναπαραγωγής στη λειτουργία 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Romanian update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
23:35:19 2014 +0100| [e4830b010616bb456fc39529cbb7165ea231739d] | committer: 
Christoph Miebach

l10n: Romanian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=e4830b010616bb456fc39529cbb7165ea231739d
---

 po/ro.po |  175 +-
 1 file changed, 92 insertions(+), 83 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=e4830b010616bb456fc39529cbb7165ea231739d
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Slovak update

2014-01-18 Thread Marián Hikaník
vlc/vlc-2.1 | branch: master | Marián Hikaník mhika...@users.sourceforge.net 
| Sat Jan 18 23:38:28 2014 +0100| [7028b696312670de353546da7dd465a3006c275c] | 
committer: Christoph Miebach

l10n: Slovak update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=7028b696312670de353546da7dd465a3006c275c
---

 po/sk.po |   73 +++---
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 4af83c4..b1e0d6f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
-# Marian Hikanik mhika...@users.sourceforge.net, 2012-2013
+# Marian Hikanik mhika...@users.sourceforge.net, 2012-2014
 msgid 
 msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-10-27 13:16+\n
+PO-Revision-Date: 2014-01-09 11:00+\n
 Last-Translator: mhikanik mhika...@users.sourceforge.net\n
 Language-Team: Slovak (http://www.transifex.com/projects/p/vlc-trans/;
 language/sk/)\n
@@ -176,8 +176,8 @@ msgstr Titulky / OSD
 msgid 
 Settings related to On-Screen-Display, subtitles and \overlay subpictures\
 msgstr 
-Rôzne nastavenia, ktoré sa vzťahujú k OSD ovládaniu, titulkom alebo k  
-\obrázkom používaným pri prekrývaní \
+Rôzne nastavenia vzťahujúce sa k OSD ovládaniu, titulkom a k  \obrázkom 
+používaným pri prekrývaní\
 
 #: include/vlc_config_cat.h:93
 msgid Input / Codecs
@@ -196,9 +196,9 @@ msgid 
 Settings related to the various access methods. Common settings you may want 
 to alter are HTTP proxy or caching settings.
 msgstr 
-Toto sú nastavenia, ktoré sa nejakým spôsobom vzťahujú k rôznym metódam 
-prístupu. K nastaveniam, ktoré treba častokrát zmeniť patria najmä 
-nastavenia HTTP proxy alebo nastavenia ukladania do vyrovnávacej pamäti.
+Toto sú nastavenia, ktoré sa vzťahujú k rôznym metódam prístupu. K 
+nastaveniam, ktoré treba častokrát zmeniť patria nastavenia HTTP proxy alebo 
+nastavenia ukladania do vyrovnávacej pamäti.
 
 #: include/vlc_config_cat.h:103
 msgid Stream filters
@@ -246,8 +246,7 @@ msgstr Nastavenia pre titulky, teletext a dekodéry či 
kodéry CC. 
 
 #: include/vlc_config_cat.h:120
 msgid General input settings. Use with care...
-msgstr 
-Nastavenia všeobecného vstupu. Týmto nastaveniam venujte zvýšenú pozornosť...
+msgstr Všeobecné nastavenia vstupu. Venujte im zvýšenú pozornosť...
 
 #: include/vlc_config_cat.h:123 src/libvlc-module.c:1897
 #: modules/access/avio.h:56
@@ -365,8 +364,9 @@ msgid 
 Settings related to playlist behaviour (e.g. playback mode) and to modules 
 that automatically add items to the playlist (\service discovery\ modules).
 msgstr 
-Nastavenia vplývajúce na správanie sa playlistu (napr. v playback-režime) a 
-modulov, ktoré dokážu automaticky pridávať do playlistu nové položky.
+Nastavenia vplývajúce na správanie sa playlistu (napr. v režime prehrávania) 
+a modulov, ktoré automaticky pridávajú do playlistu nové položky (zisťovacie 
+moduly).
 
 #: include/vlc_config_cat.h:174
 msgid General playlist behaviour
@@ -391,8 +391,7 @@ msgstr Pokročilé
 
 #: include/vlc_config_cat.h:181
 msgid Advanced settings. Use with care...
-msgstr 
-Pokročilé nastavenia. Zmene týchto nastavení venujte zvýšenú pozornosť...
+msgstr Pokročilé nastavenia. Ich zmene venujte zvýšenú pozornosť...
 
 #: include/vlc_config_cat.h:183
 msgid Advanced settings
@@ -406,7 +405,7 @@ msgstr Sieť
 
 #: include/vlc_config_cat.h:189
 msgid These modules provide network functions to all other parts of VLC.
-msgstr Tieto moduly zabezpečujú v programe VLC fungovanie siete.
+msgstr Tieto moduly zabezpečujú fungovanie siete pre ostatné časti VLC.
 
 #: include/vlc_config_cat.h:196
 msgid These are general settings for video/audio/subtitle encoding modules.
@@ -760,7 +759,7 @@ msgstr reťazec / príkaz
 
 #: src/config/help.c:127
 msgid To get exhaustive help, use '-H'.
-msgstr Pre získanie úplného pomocníka použite príkaz '-H'.
+msgstr Na získanie úplného pomocníka použite príkaz '-H'.
 
 #: src/config/help.c:131
 #, c-format
@@ -835,11 +834,11 @@ msgstr 
 
 #: src/config/help.c:514
 msgid  (default enabled)
-msgstr (v predvolenom nastavení: zapnuté)
+msgstr (predvolene: zapnuté)
 
 #: src/config/help.c:515
 msgid  (default disabled)
-msgstr (v predvolenom nastavení: vypnuté)
+msgstr (predvolene: vypnuté)
 
 #: src/config/help.c:680 src/config/help.c:683 src/config/help.c:690
 #: src/config/help.c:692
@@ -849,8 +848,8 @@ msgstr Poznámka:
 #: src/config/help.c:681 src/config/help.c:684
 msgid add --advanced to your command line to see advanced options.
 msgstr 
-Do príkazového riadka zadajte príkaz add --advanced a zobrazia sa pokročilé 
-nastavenia.
+Na zobrazenie pokročilých nastavení pridajte do príkazového riadka parameter 
+--advanced.
 
 #: src/config/help.c:694
 #, c-format

[vlc-commits] l10n: Russian update

2014-01-18 Thread Alexander Lakhin
vlc/vlc-2.1 | branch: master | Alexander Lakhin exclus...@gmail.com | Sat Jan 
18 23:36:27 2014 +0100| [23c34944641cfc5f68d677065d8bf4e4bdf0a771] | committer: 
Christoph Miebach

l10n: Russian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=23c34944641cfc5f68d677065d8bf4e4bdf0a771
---

 po/ru.po |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 3b012eb..2353cf4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,8 +14,8 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-09 08:20+\n
-Last-Translator: Yaron Shahrabani sh.ya...@gmail.com\n
+PO-Revision-Date: 2013-12-21 08:04+\n
+Last-Translator: law exclus...@gmail.com\n
 Language-Team: Russian (http://www.transifex.com/projects/p/vlc-trans/;
 language/ru/)\n
 Language: ru\n
@@ -18373,9 +18373,8 @@ msgid Lua HTTP
 msgstr HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr Приостановить iTunes на время игры в VLC
+msgstr Управлять iTunes при воспроизведении
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -29245,9 +29244,6 @@ msgstr ; 
 msgid Media Manager List
 msgstr Список настроек медиаменеджера
 
-#~ msgid Show Details
-#~ msgstr Показать подробности
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -31181,6 +31177,10 @@ msgstr Список настроек медиаменеджера
 #~ msgstr Ввод для захвата iSight
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr Информация о кодеке
+
+#, fuzzy
 #~ msgid Add a subtitle file
 #~ msgstr Использовать файл субтитров
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Dutch update

2014-01-18 Thread Thomas De Rocker
vlc/vlc-2.1 | branch: master | Thomas De Rocker thomasderoc...@hotmail.com | 
Sat Jan 18 23:23:26 2014 +0100| [0065914acb32e037a53848b8bc5599a0f40c8b90] | 
committer: Christoph Miebach

l10n: Dutch update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=0065914acb32e037a53848b8bc5599a0f40c8b90
---

 po/nl.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index b9bba25..1ccf8ac 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-28 15:14+\n
+PO-Revision-Date: 2013-12-08 11:01+\n
 Last-Translator: Thomas De Rocker\n
 Language-Team: Dutch (http://www.transifex.com/projects/p/vlc-trans/language/;
 nl/)\n
@@ -18458,9 +18458,8 @@ msgid Lua HTTP
 msgstr Lua HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr iTunes pauzeren tijdens afspelen van VLC
+msgstr iTunes bedienen tijdens afspelen
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -29455,9 +29454,6 @@ msgstr ;
 msgid Media Manager List
 msgstr Mediabeheerlijst
 
-#~ msgid Show Details
-#~ msgstr Details weergeven
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -32329,6 +32325,10 @@ msgstr Mediabeheerlijst
 #~ Weet u zeker dat u door wil gaan?
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr Codec details
+
+#, fuzzy
 #~ msgid Add a subtitle file
 #~ msgstr Ondertitelbestand gebruiken
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Ukrainian update

2014-01-18 Thread Andriy Bandura
vlc/vlc-2.1 | branch: master | Andriy Bandura andriykopanyt...@gmail.com | 
Sat Jan 18 23:52:30 2014 +0100| [a33e8e26c6143d11b6c9361670084c3f03b69fc1] | 
committer: Christoph Miebach

l10n: Ukrainian update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=a33e8e26c6143d11b6c9361670084c3f03b69fc1
---

 po/uk.po |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index e4808c9..6e256d6 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-22 09:57+\n
+PO-Revision-Date: 2013-12-09 13:27+\n
 Last-Translator: Андрій Бандура andriykopanyt...@gmail.com\n
 Language-Team: Ukrainian (http://www.transifex.com/projects/p/vlc-trans/;
 language/uk/)\n
@@ -18418,9 +18418,8 @@ msgid Lua HTTP
 msgstr Lua HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr Призупинити iTunes під час відтворення VLC
+msgstr Управляти iTunes під час відтворення
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -29314,9 +29313,6 @@ msgstr ; 
 msgid Media Manager List
 msgstr Список медіаменеджеру
 
-#~ msgid Show Details
-#~ msgstr Показати деталі
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -31944,6 +31940,10 @@ msgstr Список медіаменеджеру
 #~ msgstr Ви можете обрати режим деінтерлейсу за змовчуванням
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr Деталі кодеку
+
+#, fuzzy
 #~ msgid Add a subtitle file
 #~ msgstr Використовувати файл субтитрів
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Thai update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
23:48:47 2014 +0100| [83b456c35ce21e51d79175adfaec2071a9de039c] | committer: 
Christoph Miebach

l10n: Thai update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=83b456c35ce21e51d79175adfaec2071a9de039c
---

 po/th.po |  733 --
 1 file changed, 373 insertions(+), 360 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=83b456c35ce21e51d79175adfaec2071a9de039c
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Simplified Chinese update

2014-01-18 Thread Dean Lee
vlc/vlc-2.1 | branch: master | Dean Lee xslid...@gmail.com | Sat Jan 18 
23:57:55 2014 +0100| [cfbfa3748e416233180d5931e3d3bac0a0eb7179] | committer: 
Christoph Miebach

l10n: Simplified Chinese update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=cfbfa3748e416233180d5931e3d3bac0a0eb7179
---

 po/zh_CN.po |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b63238b..0e55e4f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,9 +11,10 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-09 08:20+\n
-Last-Translator: Yaron Shahrabani sh.ya...@gmail.com\n
-Language-Team: Chinese (China) v...@lidian.info\n
+PO-Revision-Date: 2013-12-08 09:55+\n
+Last-Translator: Dean Lee xslid...@gmail.com\n
+Language-Team: Chinese (China) (http://www.transifex.com/projects/p/vlc-;
+trans/language/zh_CN/)\n
 Language: zh_CN\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -17651,9 +17652,8 @@ msgid Lua HTTP
 msgstr Lua HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr 在 VLC 回放过程中暂停 iTunes 播放
+msgstr 回放时控制 iTunes 的播放状态
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding
@@ -28166,9 +28166,6 @@ msgstr ; 
 msgid Media Manager List
 msgstr 媒体管理器列表
 
-#~ msgid Show Details
-#~ msgstr 显示详细信息
-
 #~ msgid 
 #~ SAP is a way to publically announce streams that are being sent using 
 #~ multicast UDP or RTP.
@@ -30808,6 +30805,10 @@ msgstr 媒体管理器列表
 #~ vvv 来真正显示出调试信息。
 
 #, fuzzy
+#~ msgid Show Details
+#~ msgstr 编码详细信息
+
+#, fuzzy
 #~ msgid Add a subtitle file
 #~ msgstr 使用字幕文件(T)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Swedish update

2014-01-18 Thread A. Regnander
vlc/vlc-2.1 | branch: master | A. Regnander anton_r_3 at hotmail.com | Sat 
Jan 18 23:43:41 2014 +0100| [83dd7115da888d6dea91dc04cf21c54e06481f22] | 
committer: Christoph Miebach

l10n: Swedish update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=83dd7115da888d6dea91dc04cf21c54e06481f22
---

 po/sv.po |  739 --
 1 file changed, 427 insertions(+), 312 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=83dd7115da888d6dea91dc04cf21c54e06481f22
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] l10n: Telugu update

2014-01-18 Thread VideoLAN
vlc/vlc-2.1 | branch: master | VideoLAN video...@videolan.org | Sat Jan 18 
23:46:36 2014 +0100| [d16f786a38ff3518ae0eb38aaebbdf087b127061] | committer: 
Christoph Miebach

l10n: Telugu update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=d16f786a38ff3518ae0eb38aaebbdf087b127061
---

 po/te.po |  121 --
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/po/te.po b/po/te.po
index 381c2e3..182e6e5 100644
--- a/po/te.po
+++ b/po/te.po
@@ -10,8 +10,8 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-09-24 14:45+\n
-Last-Translator: వీవెన్ వీరపనేని vee...@gmail.com\n
+PO-Revision-Date: 2013-12-28 12:23+\n
+Last-Translator: ప్రవీణ్ ఇళ్ళ mail2...@gmail.com\n
 Language-Team: Telugu (http://www.transifex.com/projects/p/vlc-trans/;
 language/te/)\n
 Language: te\n
@@ -87,15 +87,15 @@ msgstr వేగపుమీటల అమరికలు
 #: share/lua/http/dialogs/create_stream.html:150
 #: modules/gui/qt4/ui/profiles.h:704 modules/gui/qt4/ui/profiles.h:735
 msgid Audio
-msgstr ఆడియో
+msgstr శ్రవ్యకం
 
 #: include/vlc_config_cat.h:54
 msgid Audio settings
-msgstr ఆడియో అమరికలు
+msgstr శ్రవ్యక అమరికలు
 
 #: include/vlc_config_cat.h:56
 msgid General audio settings
-msgstr సాధారణ ఆడియో అమరికలు
+msgstr సాధారణ శ్రవ్యక అమరికలు
 
 #: include/vlc_config_cat.h:58 include/vlc_config_cat.h:80
 #: modules/gui/qt4/ui/profiles.h:733 modules/gui/qt4/ui/profiles.h:743
@@ -114,7 +114,7 @@ msgstr దృశ్యమాణాలు
 #: include/vlc_config_cat.h:62 src/audio_output/output.c:284
 #: src/libvlc-module.c:197
 msgid Audio visualizations
-msgstr ఆడియో దృశ్యమానాలు
+msgstr శ్రవ్యక దృశ్యమానాలు
 
 #: include/vlc_config_cat.h:64 include/vlc_config_cat.h:76
 msgid Output modules
@@ -132,7 +132,7 @@ msgstr ఇతరాలు
 
 #: include/vlc_config_cat.h:68
 msgid Miscellaneous audio settings and modules.
-msgstr ఇతర ఆడియో అమరికలు మరియు పర్వికాలు.
+msgstr ఇతర శ్రవ్యక అమరికలు మరియు పర్వికాలు.
 
 #: include/vlc_config_cat.h:71 src/input/es_out.c:2869 src/input/es_out.c:2951
 #: src/libvlc-module.c:1510 modules/access/imem.c:64
@@ -148,15 +148,15 @@ msgstr ఇతర ఆడియో అమరికలు మరియు పర
 #: modules/gui/qt4/ui/profiles.h:705 modules/gui/qt4/ui/profiles.h:709
 #: modules/gui/qt4/ui/sprefs_video.h:353
 msgid Video
-msgstr వీడియో
+msgstr దృశ్యకం
 
 #: include/vlc_config_cat.h:72
 msgid Video settings
-msgstr వీడియో అమరికలు
+msgstr దృశ్యక అమరికలు
 
 #: include/vlc_config_cat.h:74
 msgid General video settings
-msgstr సాధారణ వీడియో అమరికలు
+msgstr సాధారణ దృశ్యక అమరికలు
 
 #: include/vlc_config_cat.h:78
 msgid Choose your preferred video output and configure it here.
@@ -869,55 +869,55 @@ msgstr 
 
 #: src/config/keys.c:71
 msgid F1
-msgstr 
+msgstr F1
 
 #: src/config/keys.c:72
 msgid F10
-msgstr 
+msgstr F10
 
 #: src/config/keys.c:73
 msgid F11
-msgstr 
+msgstr F11
 
 #: src/config/keys.c:74
 msgid F12
-msgstr 
+msgstr F12
 
 #: src/config/keys.c:75
 msgid F2
-msgstr 
+msgstr F2
 
 #: src/config/keys.c:76
 msgid F3
-msgstr 
+msgstr F3
 
 #: src/config/keys.c:77
 msgid F4
-msgstr 
+msgstr F4
 
 #: src/config/keys.c:78
 msgid F5
-msgstr 
+msgstr F5
 
 #: src/config/keys.c:79
 msgid F6
-msgstr 
+msgstr F6
 
 #: src/config/keys.c:80
 msgid F7
-msgstr 
+msgstr F7
 
 #: src/config/keys.c:81
 msgid F8
-msgstr 
+msgstr F8
 
 #: src/config/keys.c:82
 msgid F9
-msgstr 
+msgstr F9
 
 #: src/config/keys.c:83
 msgid Home
-msgstr 
+msgstr ముంగిలి
 
 #: src/config/keys.c:84
 msgid Insert
@@ -1055,27 +1055,27 @@ msgstr ధ్వని పెంచు
 
 #: src/config/keys.c:119
 msgid Zoom In
-msgstr 
+msgstr అతిరూపించు
 
 #: src/config/keys.c:120
 msgid Zoom Out
-msgstr 
+msgstr అవరూపించు
 
 #: src/config/keys.c:248
 msgid Ctrl+
-msgstr 
+msgstr Ctrl+
 
 #: src/config/keys.c:249
 msgid Alt+
-msgstr 
+msgstr Alt+
 
 #: src/config/keys.c:250
 msgid Shift+
-msgstr 
+msgstr Shift+
 
 #: src/config/keys.c:251
 msgid Meta+
-msgstr 
+msgstr Meta+
 
 #: src/config/keys.c:252
 msgid Command+
@@ -5260,31 +5260,31 @@ msgstr 
 
 #: modules/access/alsa.c:49
 msgid 192000 Hz
-msgstr 
+msgstr 192000 Hz
 
 #: modules/access/alsa.c:49
 msgid 176400 Hz
-msgstr 
+msgstr 176400 Hz
 
 #: modules/access/alsa.c:50
 msgid 96000 Hz
-msgstr 
+msgstr 96000 Hz
 
 #: modules/access/alsa.c:50
 msgid 88200 Hz
-msgstr 
+msgstr 88200 Hz
 
 #: modules/access/alsa.c:50
 msgid 48000 Hz
-msgstr 
+msgstr 48000 Hz
 
 #: modules/access/alsa.c:50
 msgid 44100 Hz
-msgstr 
+msgstr 44100 Hz
 
 #: modules/access/alsa.c:51
 msgid 32000 Hz
-msgstr 
+msgstr 32000 Hz
 
 #: modules/access/alsa.c:51
 msgid 22050 Hz
@@ -5357,7 +5357,7 @@ msgstr 
 #: modules/access/bluray.c:69 modules/services_discovery/udev.c:596
 #: modules/gui/qt4/ui/open_disk.h:299
 msgid Blu-ray
-msgstr 
+msgstr బ్లూ-రే
 
 #: modules/access/bluray.c:70
 msgid Blu-ray Disc support (libbluray)
@@ -15101,7 +15101,7 @@ msgstr VLC మాధ్యమ ప్రదర్శకం గురించి
 

[vlc-commits] l10n: Turkish update

2014-01-18 Thread Kaya Zeren
vlc/vlc-2.1 | branch: master | Kaya Zeren kayaze...@gmail.com | Sat Jan 18 
23:50:33 2014 +0100| [b85ff9b36c384f3b1a6fbf859244389b688b7fc5] | committer: 
Christoph Miebach

l10n: Turkish update

Signed-off-by: Christoph Miebach christoph.mieb...@web.de

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b85ff9b36c384f3b1a6fbf859244389b688b7fc5
---

 po/tr.po |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index 7bd2ee8..164b852 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -19,7 +19,7 @@ msgstr 
 Project-Id-Version: VLC - Trans\n
 Report-Msgid-Bugs-To: vlc-de...@videolan.org\n
 POT-Creation-Date: 2013-12-07 17:17+0100\n
-PO-Revision-Date: 2013-11-09 17:14+\n
+PO-Revision-Date: 2013-12-08 14:46+\n
 Last-Translator: Kaya Zeren kayaze...@gmail.com\n
 Language-Team: Turkish (http://www.transifex.com/projects/p/vlc-trans/;
 language/tr/)\n
@@ -18414,9 +18414,8 @@ msgid Lua HTTP
 msgstr Lua HTTP
 
 #: modules/gui/macosx/simple_prefs.m:374
-#, fuzzy
 msgid Control iTunes during playback
-msgstr VLC oynatımı sırasında iTunes duraklatılsın
+msgstr Oynatım sırasında iTunes denetlensin
 
 #: modules/gui/macosx/simple_prefs.m:377
 msgid Default Encoding

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Update NEWS for translations

2014-01-18 Thread Christoph Miebach
vlc/vlc-2.1 | branch: master | Christoph Miebach christoph.mieb...@web.de | 
Sun Jan 19 00:22:45 2014 +0100| [ebe0396ef8a018b636af5fa2b96ad88e2352c5dd] | 
committer: Christoph Miebach

Update NEWS for translations

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ebe0396ef8a018b636af5fa2b96ad88e2352c5dd
---

 NEWS |9 +
 1 file changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index dfac80a..096357a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,15 @@
 Changes between 2.1.2 and 2.1.3:
 
 
+Translations:
+ * Update of Bulgarian, Catalan, Czech, Danish, German, Modern Greek,
+   Spanish, Basque, Finnish, French, Scottish Gaelic, Galician, Hebrew,
+   Hungarian, Italian, Japanese, Korean, Malay, Norwegian Bokmål, Nepali,
+   Dutch, Polish, Brazilian Portuguese, Portuguese, Romanian, Russian,
+   Sinhala, Slovak, Slovenian, Swedish, Telugu, Thai, Turkish, Ukrainian
+   and Simplified Chinese translations
+
+
 Changes between 2.1.1 and 2.1.2:
 
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] musicbrainz.lua: Support coverartarchive.org

2014-01-18 Thread Wieland Hoffmann
vlc/vlc-2.1 | branch: master | Wieland Hoffmann themi...@gmail.com | Sun Jan 
12 23:04:08 2014 +0100| [487657c96a3ec921e552d093c6d9bfe4a311932f] | committer: 
Jean-Baptiste Kempf

musicbrainz.lua: Support coverartarchive.org

If the Cover Art Archive has artwork for this album, use the 500x500px
version of it.

Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit ab7c22aaa17e2b314f8c2f76370edccac07fca58)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=487657c96a3ec921e552d093c6d9bfe4a311932f
---

 share/lua/meta/art/00_musicbrainz.lua |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/share/lua/meta/art/00_musicbrainz.lua 
b/share/lua/meta/art/00_musicbrainz.lua
index 1e11cbd..67648d7 100644
--- a/share/lua/meta/art/00_musicbrainz.lua
+++ b/share/lua/meta/art/00_musicbrainz.lua
@@ -1,5 +1,5 @@
 --[[
- Gets an artwork from amazon
+ Gets an artwork from the Cover Art Archive or Amazon
 
  $Id$
  Copyright © 2007-2010 the VideoLAN team
@@ -19,17 +19,22 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 --]]
 
-function try_query(query)
-local s = vlc.stream( query )
+function try_query(mbid)
+local relquery = http://mb.videolan.org/ws/2/release/; .. mbid
+local s = vlc.stream( relquery )
 if not s then return nil end
 local page = s:read( 65653 )
 
+found, _ = string.find( page, artworktrue/artwork )
+if found then
+return http://coverartarchive.org/release/..mbid../front-500;
+end
 -- FIXME: multiple results may be available
 _, _, asin = string.find( page, asin(%w+)/asin )
 if asin then
 return 
http://images.amazon.com/images/P/..asin...01._SCLZZZ_.jpg;
 end
-vlc.msg.dbg(ASIN not found)
+vlc.msg.dbg(Neither coverartarchive.org nor amazon have cover art for 
this release)
 return nil
 end
 
@@ -69,8 +74,7 @@ function fetch_art()
 releaseid = get_releaseid( recquery )
 end
 if releaseid then
-relquery = http://mb.videolan.org/ws/2/release/; .. releaseid
-return try_query( relquery )
+return try_query( releaseid )
 else
 return nil
 end

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] musicbrainz.lua: Use get_releaseid even if the album title is known

2014-01-18 Thread Wieland Hoffmann
vlc/vlc-2.1 | branch: master | Wieland Hoffmann themi...@gmail.com | Sun Jan 
12 23:04:07 2014 +0100| [b639c41868b55be7a0794b7d495cedc653fcb0cc] | committer: 
Jean-Baptiste Kempf

musicbrainz.lua: Use get_releaseid even if the album title is known

This renames `try_release` to `get_releaseid` and uses it to find the
MusicBrainz Identifier. That MBID is later used in the query passed to
try_query.

Not using the ASIN returned from the search server in the get_releaseid
call means one additional request is performed in the case that both the
artist and the album name are already known.

Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit f18236eee239fa8b57641ba82f20576ab244202f)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=b639c41868b55be7a0794b7d495cedc653fcb0cc
---

 share/lua/meta/art/00_musicbrainz.lua |   27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/share/lua/meta/art/00_musicbrainz.lua 
b/share/lua/meta/art/00_musicbrainz.lua
index 2e224f4..1e11cbd 100644
--- a/share/lua/meta/art/00_musicbrainz.lua
+++ b/share/lua/meta/art/00_musicbrainz.lua
@@ -33,15 +33,15 @@ function try_query(query)
 return nil
 end
 
--- Return the mbid for first release
-function try_release(query)
+-- Return the mbid for the first release returned by the MusicBrainz search 
server for query
+function get_releaseid(query)
 local s = vlc.stream( query )
 if not s then return nil end
 local page = s:read( 65653 )
 
 -- FIXME: multiple results may be available and the first one is not
 -- guaranteed to have asin, so if it doesnt, we wouldnt get any art
-_, _, releaseid = string.find( page, release id=\([%x%-]-)\ )
+_, _, releaseid = string.find( page, release id=\([%x%-]-)\ )
 if releaseid then
 return releaseid
 end
@@ -56,19 +56,22 @@ function fetch_art()
 or meta[Listing Type] == tv
 then return nil end
 
+local releaseid = nil
+
 if meta[artist] and meta[album] then
 query = artist:\ .. meta[artist] .. \ AND release:\ .. 
meta[album] .. \
 relquery = http://mb.videolan.org/ws/2/release/?query=; .. 
vlc.strings.encode_uri_component( query )
-return try_query( relquery )
-elseif meta[artist] and meta[title] then
+releaseid = get_releaseid( relquery )
+end
+if not releaseid and meta[artist] and meta[title] then
 query = artist:\ .. meta[artist] .. \ AND recording:\ .. 
meta[title] .. \
 recquery = http://mb.videolan.org/ws/2/recording/?query=; .. 
vlc.strings.encode_uri_component( query )
-releaseid = try_release( recquery )
-if releaseid then
-relquery = http://mb.videolan.org/ws/2/release/; .. releaseid
-return try_query( relquery )
-else
-return nil
-end
+releaseid = get_releaseid( recquery )
+end
+if releaseid then
+relquery = http://mb.videolan.org/ws/2/release/; .. releaseid
+return try_query( relquery )
+else
+return nil
 end
 end

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] playlist: Recurse on ITEM_TYPE_NODE when calculating the duration

2014-01-18 Thread Wieland Hoffmann
vlc/vlc-2.1 | branch: master | Wieland Hoffmann themi...@gmail.com | Sat Jan 
11 14:10:16 2014 +| [6ed4796b47ea3d7a83acca0c039fde4eb8f55d4d] | committer: 
Jean-Baptiste Kempf

playlist: Recurse on ITEM_TYPE_NODE when calculating the duration

When adding an item X whose underlying input_item_t's i_type is
ITEM_TYPE_NODE (like a folder), we need to call playlist_GetNodeDuration
on X again for the duration of X to be the sum of the durations of X's
children.

Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 8eae542ad94652396035ee70920ca2ab107033ed)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=6ed4796b47ea3d7a83acca0c039fde4eb8f55d4d
---

 src/playlist/item.c |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/playlist/item.c b/src/playlist/item.c
index e902063..c6113b1 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -733,7 +733,13 @@ mtime_t playlist_GetNodeDuration( playlist_item_t* node )
 
 if( node-i_children != -1 )
 for( int i = 0; i  node-i_children; i++ )
-mt_duration += input_item_GetDuration( 
node-pp_children[i]-p_input );
+{
+input_item_t* p_input = node-pp_children[i]-p_input;
+if ( p_input-i_type == ITEM_TYPE_NODE )
+mt_duration += playlist_GetNodeDuration( node-pp_children[i] 
);
+else
+mt_duration += input_item_GetDuration( p_input );
+}
 
 return mt_duration;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] musicbrainz.lua: Use MBIDs from files, if they exist

2014-01-18 Thread Wieland Hoffmann
vlc/vlc-2.1 | branch: master | Wieland Hoffmann themi...@gmail.com | Sun Jan 
12 23:04:09 2014 +0100| [5cc747e80b2e45f73533cf561244c481f2518d0c] | committer: 
Jean-Baptiste Kempf

musicbrainz.lua: Use MBIDs from files, if they exist

If the MBID of the album is already in the `meta` table, use it to query
the MusicBrainz web service, instead of doing extra requests to the
search server.

Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 30cd5db56a0002cb9d6e080022e22d28cac0ec3b)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=5cc747e80b2e45f73533cf561244c481f2518d0c
---

 share/lua/meta/art/00_musicbrainz.lua |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/lua/meta/art/00_musicbrainz.lua 
b/share/lua/meta/art/00_musicbrainz.lua
index 67648d7..0523ec4 100644
--- a/share/lua/meta/art/00_musicbrainz.lua
+++ b/share/lua/meta/art/00_musicbrainz.lua
@@ -63,7 +63,13 @@ function fetch_art()
 
 local releaseid = nil
 
-if meta[artist] and meta[album] then
+for _, k in ipairs({MUSICBRAINZ_ALBUMID, MusicBrainz Album Id}) do
+if meta[k] then
+releaseid = meta[k]
+end
+end
+
+if not releaseid and meta[artist] and meta[album] then
 query = artist:\ .. meta[artist] .. \ AND release:\ .. 
meta[album] .. \
 relquery = http://mb.videolan.org/ws/2/release/?query=; .. 
vlc.strings.encode_uri_component( query )
 releaseid = get_releaseid( relquery )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits