Merge pull request #4852 from FernetMenta/aefixes

[vuplus_xbmc] / lib / DllLibbluray.h

diff --git a/lib/DllLibbluray.h b/lib/DllLibbluray.h
index a04994c..428d603 100644 (file)
--- a/lib/DllLibbluray.h
+++ b/lib/DllLibbluray.h
@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://www.xbmc.org
+ *      http://xbmc.org
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,9 +13,8 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
  *
  */
 #pragma once
@@ -76,6 +75,9 @@ public:
   virtual int      bd_set_player_setting        (BLURAY *bd, uint32_t idx, uint32_t value)=0;
   virtual int      bd_set_player_setting_str    (BLURAY *bd, uint32_t idx, const char *s)=0;
   virtual void     bd_register_overlay_proc     (BLURAY *bd, void *handle, bd_overlay_proc_f func)=0;
+#ifdef HAVE_LIBBLURAY_BDJ
+  virtual void     bd_register_argb_overlay_proc(BLURAY *bd, void *handle, bd_argb_overlay_proc_f func, struct bd_argb_buffer_s *buf)=0;
+#endif
   virtual int      bd_menu_call                 (BLURAY *bd, int64_t pts)=0;
 };
 
@@ -120,6 +122,9 @@ class DllLibbluray : public DllDynamic, DllLibblurayInterface
   DEFINE_METHOD3(int,                 bd_set_player_setting,     (BLURAY *p1, uint32_t p2, uint32_t p3))
   DEFINE_METHOD3(int,                 bd_set_player_setting_str, (BLURAY *p1, uint32_t p2, const char *p3))
   DEFINE_METHOD3(void,                bd_register_overlay_proc,  (BLURAY *p1, void *p2, bd_overlay_proc_f p3))
+#ifdef HAVE_LIBBLURAY_BDJ
+  DEFINE_METHOD4(void,                bd_register_argb_overlay_proc, (BLURAY *p1, void *p2, bd_argb_overlay_proc_f p3, struct bd_argb_buffer_s *p4))
+#endif
   DEFINE_METHOD2(int,                 bd_menu_call,              (BLURAY *p1, int64_t p2))
 
   BEGIN_METHOD_RESOLVE()
@@ -160,6 +165,9 @@ class DllLibbluray : public DllDynamic, DllLibblurayInterface
     RESOLVE_METHOD(bd_set_player_setting)
     RESOLVE_METHOD(bd_set_player_setting_str)
     RESOLVE_METHOD(bd_register_overlay_proc)
+#ifdef HAVE_LIBBLURAY_BDJ
+    RESOLVE_METHOD(bd_register_argb_overlay_proc)
+#endif
     RESOLVE_METHOD(bd_menu_call)
   END_METHOD_RESOLVE()