am: Use plugins/ for VLC.app.

[vlc] / modules / video_output / aa.c

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 5c9a256823674c6e9da2dd16d2e754a61610646c..925ecb3ad4fd4ba9e2993398e02a228f9b5c5659 100644 (file)
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -58,10 +58,10 @@ vlc_module_end()
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static picture_t *Get    (vout_display_t *);
-static void       Prepare(vout_display_t *, picture_t *);
-static void       Display(vout_display_t *, picture_t *);
-static int        Control(vout_display_t *, int, va_list);
+static picture_pool_t *Pool   (vout_display_t *, unsigned);
+static void            Prepare(vout_display_t *, picture_t *);
+static void            Display(vout_display_t *, picture_t *);
+static int             Control(vout_display_t *, int, va_list);
 
 /* */
 static void Manage(vout_display_t *);
@@ -115,18 +115,18 @@ static int Open(vlc_object_t *object)
     vd->fmt = fmt;
     vd->info = info;
 
-    vd->get = Get;
+    vd->pool    = Pool;
     vd->prepare = Prepare;
     vd->display = Display;
     vd->control = Control;
-    vd->manage = Manage;
+    vd->manage  = Manage;
 
     /* Inspect initial configuration and send correction events
      * FIXME how to handle aspect ratio with aa ? */
     sys->state = *vd->cfg;
     sys->state.is_fullscreen = false;
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
 
     return VLC_SUCCESS;
 
@@ -152,11 +152,12 @@ static void Close(vlc_object_t *object)
 }
 
 /**
- * Return a direct buffer
+ * Return a pool of direct buffers
  */
-static picture_t *Get(vout_display_t *vd)
+static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 {
     vout_display_sys_t *sys = vd->sys;
+    VLC_UNUSED(count);
 
     if (!sys->pool) {
         picture_resource_t rsc;
@@ -171,11 +172,8 @@ static picture_t *Get(vout_display_t *vd)
             return NULL;
 
         sys->pool = picture_pool_New(1, &p_picture);
-        if (!sys->pool)
-            return NULL;
     }
-
-    return picture_pool_Get(sys->pool);
+    return sys->pool;
 }
 
 /**
@@ -194,6 +192,8 @@ static void Prepare(vout_display_t *vd, picture_t *picture)
                            red[ i ], green[ i ], blue[ i ]);
         }
     }
+#else
+    VLC_UNUSED(picture);
 #endif
 
     aa_fastrender(sys->aa_context, 0, 0,
@@ -216,6 +216,7 @@ static void Display(vout_display_t *vd, picture_t *picture)
  */
 static int Control(vout_display_t *vd, int query, va_list args)
 {
+    VLC_UNUSED(args);
     vout_display_sys_t *sys = vd->sys;
 
     switch (query) {
@@ -281,7 +282,7 @@ static void Manage(vout_display_t *vd)
             aa_resize(sys->aa_context);
             vout_display_SendEventDisplaySize(vd,
                                               aa_imgwidth(sys->aa_context),
-                                              aa_imgheight(sys->aa_context));
+                                              aa_imgheight(sys->aa_context), false);
             break;
 
         /* TODO keys support to complete */
@@ -303,9 +304,6 @@ static void Manage(vout_display_t *vd)
         case AA_ESC:
             vout_display_SendEventKey(vd, KEY_ESC);
             break;
-        case 0x20:
-                vout_display_SendEventKey(vd, KEY_SPACE);
-                break;
         default:
             if (event >= 0x20 && event <= 0x7f)
                 vout_display_SendEventKey(vd, event);