← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid-security

« back to all changes in this revision

Viewing changes to extras/contrib/src/Patches/libcaca_driver_cocoa.diff

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2009-09-25 14:44:17 UTC
  • mfrom: (3.5.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090925144417-87vomt575d0agvqa
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc

Show diffs side-by-side

added added

removed removed

Lines of Context:
extras/contrib/src/Patches/libcaca_driver_cocoa.diff
 
1
--- libcaca-0.99.beta13b/caca/driver_cocoa.m    2007-11-25 15:00:34.000000000 +0100
 
2
+++ libcaca/caca/driver_cocoa.m 2008-01-21 17:39:14.000000000 +0100
 
3
@@ -3,7 +3,7 @@
 
4
  *  Copyright (c) 2006 Colin Delacroix <colin@zoy.org>
 
5
  *                All Rights Reserved
 
6
  *
 
7
- *  $Id$
 
8
+ *  $Id: driver_cocoa.m 1445 2007-12-16 01:50:41Z sam $
 
9
  *
 
10
  *  This library is free software. It comes without any warranty, to
 
11
  *  the extent permitted by applicable law. You can redistribute it
 
12
@@ -722,7 +722,7 @@
 
13
     return caca_keycode;
 
14
 }
 
15
 
 
16
-static BOOL handle_key_event(struct caca_event *ev, NSEvent* event)
 
17
+static BOOL handle_key_event(caca_privevent_t *ev, NSEvent* event)
 
18
 {
 
19
     if(!ev || !event)
 
20
         return NO;
 
21
@@ -774,7 +774,7 @@
 
22
 }
 
23
 
 
24
 // TODO: handle CACA_EVENT_RESIZE
 
25
-static BOOL handle_mouse_event(caca_display_t *dp, struct caca_event *ev,
 
26
+static BOOL handle_mouse_event(caca_display_t *dp, caca_privevent_t *ev,
 
27
                                NSEvent* event)
 
28
 {
 
29
     if(!ev || !event)
 
30
@@ -884,7 +884,7 @@
 
31
     [pool release];
 
32
 }
 
33
 
 
34
-static int cocoa_get_event(caca_display_t *dp, struct caca_event *ev)
 
35
+static int cocoa_get_event(caca_display_t *dp, caca_privevent_t *ev)
 
36
 {
 
37
     if(s_quit)
 
38
     {
 
39
@@ -970,12 +970,12 @@
 
40
     return 0;
 
41
 }
 
42
 
 
43
-static unsigned int cocoa_get_display_width(caca_display_t *dp)
 
44
+static unsigned int cocoa_get_display_width(caca_display_t const *dp)
 
45
 {
 
46
     return [dp->drv.p->window frame].size.width;
 
47
 }
 
48
 
 
49
-static unsigned int cocoa_get_display_height(caca_display_t *dp)
 
50
+static unsigned int cocoa_get_display_height(caca_display_t const *dp)
 
51
 {
 
52
     return [dp->drv.p->window frame].size.height;
 
53
 }