npapi-vlc | branch: master | Cheng Sun <[email protected]> | Thu Dec 22 20:01:46 2011 +0000| [fd149dd0091f2531d1fe18dd8749b4a4dd24c059] | committer: Jean-Baptiste Kempf
Move plugin metadata to correct header Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=fd149dd0091f2531d1fe18dd8749b4a4dd24c059 --- npapi/vlcplugin_base.h | 17 ++++------------- npapi/vlcshell.h | 8 ++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/npapi/vlcplugin_base.h b/npapi/vlcplugin_base.h index b2a230a..7766f00 100644 --- a/npapi/vlcplugin_base.h +++ b/npapi/vlcplugin_base.h @@ -278,14 +278,14 @@ public: bool player_has_vout(); - virtual void toggle_fullscreen() = 0; - virtual void set_fullscreen( int ) = 0; - virtual int get_fullscreen() = 0; - virtual bool create_windows() = 0; virtual bool resize_windows() = 0; virtual bool destroy_windows() = 0; + virtual void toggle_fullscreen() = 0; + virtual void set_fullscreen(bool) = 0; + virtual bool get_fullscreen() = 0; + virtual void update_controls() = 0; virtual void popup_menu() = 0; @@ -320,13 +320,4 @@ protected: static void eventAsync(void *); }; -/******************************************************************************* - * Plugin properties. - ******************************************************************************/ -#define PLUGIN_NAME "VLC Web Plugin" -#define PLUGIN_DESCRIPTION \ - "Version %s, copyright 1996-2011 VideoLAN and Authors" \ - "<br />" \ - "<a href=\"http://www.videolan.org/vlc/\";>http://www.videolan.org/vlc/</a>" - #endif diff --git a/npapi/vlcshell.h b/npapi/vlcshell.h index 559baa1..7aa792a 100644 --- a/npapi/vlcshell.h +++ b/npapi/vlcshell.h @@ -135,5 +135,13 @@ static char mimetype[] = "audio/x-flac:flac:FLAC audio;" ; +/******************************************************************************* + * Plugin properties. + ******************************************************************************/ +#define PLUGIN_NAME "VLC Web Plugin" +#define PLUGIN_DESCRIPTION \ + "Version %s, copyright 1996-2011 VideoLAN and Authors" \ + "<br />" \ + "<a href=\"http://www.videolan.org/vlc/\";>http://www.videolan.org/vlc/</a>" #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
