← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to gnome/src/video/video_renderer.h

  • Committer: Package Import Robot
  • Author(s): Francois Marier, Francois Marier, Mark Purcell
  • Date: 2014-10-18 15:08:50 UTC
  • mfrom: (1.1.12)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20141018150850-2exfk34ckb15pcwi
Tags: 1.4.1-0.1
http://bugs.debian.org/759576
http://bugs.debian.org/741130
[ Francois Marier ]
* Non-maintainer upload
* New upstream release (closes: #759576, #741130)
  - debian/rules +PJPROJECT_VERSION := 2.2.1
  - add upstream patch to fix broken TLS support
  - add patch to fix pjproject regression

[ Mark Purcell ]
* Build-Depends:
  - sflphone-daemon + libavformat-dev, libavcodec-dev, libswscale-dev,
  libavdevice-dev, libavutil-dev
  - sflphone-gnome + libclutter-gtk-1.0-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/video/video_renderer.h
34
34
#include <glib-object.h>
35
35
#include <gtk/gtk.h>
36
36
 
 
37
#include <clutter/clutter.h>
 
38
 
37
39
#define VIDEO_RENDERER_TYPE              (video_renderer_get_type())
38
40
#define VIDEO_RENDERER(obj)              (G_TYPE_CHECK_INSTANCE_CAST((obj), VIDEO_RENDERER_TYPE, VideoRenderer))
39
41
#define VIDEO_RENDERER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), VIDEO_RENDERER_TYPE, VideoRendererClass))
57
59
 
58
60
/* Public interface */
59
61
VideoRenderer *
60
 
video_renderer_new(GtkWidget *drawarea, gint width, gint height, gchar *shm_path);
 
62
video_renderer_new(ClutterActor *texture, gint width, gint height, gchar *shm_path);
61
63
 
62
64
gboolean
63
65
video_renderer_run(VideoRenderer *self);