[vlc-commits] disable 'branding' by default, but enable it in the test pages
Felix Paul Kühne
git at videolan.org
Mon Feb 17 23:56:40 CET 2014
npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Feb 17 23:56:46 2014 +0100| [989cca8018ee8b2ff5ee7e256580fbaf894e2f34] | committer: Felix Paul Kühne
disable 'branding' by default, but enable it in the test pages
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=989cca8018ee8b2ff5ee7e256580fbaf894e2f34
---
common/vlc_player_options.h | 2 +-
extras/macosx/dmg_setup.scpt | Bin 4826 -> 4826 bytes
share/test/test.html | 2 ++
share/test/windowless.html | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/vlc_player_options.h b/common/vlc_player_options.h
index ded3874..6929d55 100644
--- a/common/vlc_player_options.h
+++ b/common/vlc_player_options.h
@@ -64,7 +64,7 @@ class vlc_player_options
public:
vlc_player_options()
:_autoplay(true), _show_toolbar(true), _enable_fullscreen(true),
- _bg_color(/*black*/"#000000"), _enable_branding(true)
+ _bg_color(/*black*/"#000000"), _enable_branding(false)
{}
void set_autoplay(bool ap){
diff --git a/extras/macosx/dmg_setup.scpt b/extras/macosx/dmg_setup.scpt
index ecf0f6b..8172b41 100644
Binary files a/extras/macosx/dmg_setup.scpt and b/extras/macosx/dmg_setup.scpt differ
diff --git a/share/test/test.html b/share/test/test.html
index db1caa4..d0716ba 100644
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -263,8 +263,10 @@ Insert VideoLAN.VLCPlugin.2
height="480"
toolbar="true"
loop="true"
+ branding="true"
text="Waiting for video"
bgcolor="#000000"
+ allowfullscreen="true"
name="vlc">
</EMBED>
</object>
diff --git a/share/test/windowless.html b/share/test/windowless.html
index 17432eb..9ab2240 100644
--- a/share/test/windowless.html
+++ b/share/test/windowless.html
@@ -263,6 +263,7 @@ Insert VideoLAN.VLCPlugin.2
text="Waiting for video"
windowless="true"
bgcolor="#000000"
+ branding="true"
name="vlc">
</EMBED>
</object>
More information about the vlc-commits
mailing list