[vlc-commits] npapi: Return vlc.video.fullscreen as a boolean
Hugo Beauzée-Luyssen
git at videolan.org
Wed May 6 00:42:19 CEST 2015
npapi-vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed May 6 00:32:53 2015 +0200| [d4721464a2888b2419973fb8f7ea4031e3319483] | committer: Hugo Beauzée-Luyssen
npapi: Return vlc.video.fullscreen as a boolean
refs #14500
> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=d4721464a2888b2419973fb8f7ea4031e3319483
---
npapi/vlcplugin_base.h | 2 +-
npapi/vlcplugin_gtk.cpp | 2 +-
npapi/vlcplugin_gtk.h | 2 +-
npapi/vlcplugin_mac.h | 2 +-
npapi/vlcplugin_mac.mm | 2 +-
npapi/vlcplugin_win.cpp | 2 +-
npapi/vlcplugin_win.h | 2 +-
npapi/vlcplugin_xcb.cpp | 2 +-
npapi/vlcplugin_xcb.h | 2 +-
npapi/vlcwindowless_base.h | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h
index 721219a..2ad70cd 100644
--- a/npapi/vlcplugin_base.h
+++ b/npapi/vlcplugin_base.h
@@ -108,7 +108,7 @@ public:
virtual void toggle_fullscreen() = 0;
virtual void set_fullscreen(int) = 0;
- virtual int get_fullscreen() = 0;
+ virtual bool get_fullscreen() = 0;
virtual void set_toolbar_visible(bool) = 0;
virtual bool get_toolbar_visible() = 0;
diff --git a/npapi/vlcplugin_gtk.cpp b/npapi/vlcplugin_gtk.cpp
index ca54f6c..7bb44f5 100644
--- a/npapi/vlcplugin_gtk.cpp
+++ b/npapi/vlcplugin_gtk.cpp
@@ -121,7 +121,7 @@ void VlcPluginGtk::set_fullscreen(int yes)
}
}
-int VlcPluginGtk::get_fullscreen()
+bool VlcPluginGtk::get_fullscreen()
{
return is_fullscreen;
}
diff --git a/npapi/vlcplugin_gtk.h b/npapi/vlcplugin_gtk.h
index 91df8ae..e9adbc5 100644
--- a/npapi/vlcplugin_gtk.h
+++ b/npapi/vlcplugin_gtk.h
@@ -44,7 +44,7 @@ public:
void toggle_fullscreen();
void set_fullscreen(int);
- int get_fullscreen();
+ bool get_fullscreen();
void do_set_fullscreen(bool);
void set_toolbar_visible(bool);
diff --git a/npapi/vlcplugin_mac.h b/npapi/vlcplugin_mac.h
index 0a554e8..a686806 100644
--- a/npapi/vlcplugin_mac.h
+++ b/npapi/vlcplugin_mac.h
@@ -38,7 +38,7 @@ public:
void toggle_fullscreen();
void set_fullscreen( int );
- int get_fullscreen();
+ bool get_fullscreen();
bool create_windows();
bool resize_windows();
diff --git a/npapi/vlcplugin_mac.mm b/npapi/vlcplugin_mac.mm
index 251f8a7..abe2759 100644
--- a/npapi/vlcplugin_mac.mm
+++ b/npapi/vlcplugin_mac.mm
@@ -255,7 +255,7 @@ void VlcPluginMac::set_fullscreen(int i_value)
this->update_controls();
}
-int VlcPluginMac::get_fullscreen()
+bool VlcPluginMac::get_fullscreen()
{
return libvlc_get_fullscreen(getMD());
}
diff --git a/npapi/vlcplugin_win.cpp b/npapi/vlcplugin_win.cpp
index e81fc07..4326148 100644
--- a/npapi/vlcplugin_win.cpp
+++ b/npapi/vlcplugin_win.cpp
@@ -137,7 +137,7 @@ void VlcPluginWin::set_fullscreen(int yes)
}
}
-int VlcPluginWin::get_fullscreen()
+bool VlcPluginWin::get_fullscreen()
{
return _WindowsManager.IsFullScreen();
}
diff --git a/npapi/vlcplugin_win.h b/npapi/vlcplugin_win.h
index 2f7a6d2..4eb6f12 100644
--- a/npapi/vlcplugin_win.h
+++ b/npapi/vlcplugin_win.h
@@ -41,7 +41,7 @@ public:
void toggle_fullscreen();
void set_fullscreen( int );
- int get_fullscreen();
+ bool get_fullscreen();
bool create_windows();
bool resize_windows();
diff --git a/npapi/vlcplugin_xcb.cpp b/npapi/vlcplugin_xcb.cpp
index d833d71..87685d9 100644
--- a/npapi/vlcplugin_xcb.cpp
+++ b/npapi/vlcplugin_xcb.cpp
@@ -60,7 +60,7 @@ void VlcPluginXcb::set_fullscreen(int yes)
player().get_mp().setFullscreen( yes );
}
-int VlcPluginXcb::get_fullscreen()
+bool VlcPluginXcb::get_fullscreen()
{
if (player().mlp().isPlaying())
return player().get_mp().fullscreen();
diff --git a/npapi/vlcplugin_xcb.h b/npapi/vlcplugin_xcb.h
index f66d372..e90a5c9 100644
--- a/npapi/vlcplugin_xcb.h
+++ b/npapi/vlcplugin_xcb.h
@@ -36,7 +36,7 @@ public:
void toggle_fullscreen();
void set_fullscreen( int );
- int get_fullscreen();
+ bool get_fullscreen();
bool create_windows();
bool resize_windows();
diff --git a/npapi/vlcwindowless_base.h b/npapi/vlcwindowless_base.h
index 483e92f..0e5614b 100644
--- a/npapi/vlcwindowless_base.h
+++ b/npapi/vlcwindowless_base.h
@@ -70,7 +70,7 @@ public:
void toggle_fullscreen() { /* STUB */ }
void set_fullscreen( int ) { /* STUB */ }
- int get_fullscreen() { return false; }
+ bool get_fullscreen() { return false; }
void set_toolbar_visible(bool) { /* STUB */ }
bool get_toolbar_visible() { return false; }
More information about the vlc-commits
mailing list