isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-12 11:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a deprecated header for ClutterTexture

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-02-27 15:44:38 +00:00
parent 3c12b3575d
commit 45d61d795b
4 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/Makefile.am
View File

@ -254,6 +254,7 @@ deprecated_h = \
$(srcdir)/deprecated/clutter-shader.h \ $(srcdir)/deprecated/clutter-shader.h \
$(srcdir)/deprecated/clutter-stage-manager.h \ $(srcdir)/deprecated/clutter-stage-manager.h \
$(srcdir)/deprecated/clutter-stage.h \ $(srcdir)/deprecated/clutter-stage.h \
$(srcdir)/deprecated/clutter-texture.h \
$(srcdir)/deprecated/clutter-timeline.h \ $(srcdir)/deprecated/clutter-timeline.h \
$(srcdir)/deprecated/clutter-timeout-pool.h \ $(srcdir)/deprecated/clutter-timeout-pool.h \
$(NULL) $(NULL)

1
clutter/clutter-deprecated.h
View File

@ -26,6 +26,7 @@
#include "deprecated/clutter-shader.h" #include "deprecated/clutter-shader.h"
#include "deprecated/clutter-stage-manager.h" #include "deprecated/clutter-stage-manager.h"
#include "deprecated/clutter-stage.h" #include "deprecated/clutter-stage.h"
#include "deprecated/clutter-texture.h"
#include "deprecated/clutter-timeline.h" #include "deprecated/clutter-timeline.h"
#include "deprecated/clutter-timeout-pool.h" #include "deprecated/clutter-timeout-pool.h"

11
clutter/clutter-texture.h
View File

@ -127,9 +127,6 @@ ClutterActor * clutter_texture_new (void);
ClutterActor * clutter_texture_new_from_file (const gchar *filename, ClutterActor * clutter_texture_new_from_file (const gchar *filename,
GError **error); GError **error);
CLUTTER_DEPRECATED_FOR(ClutterOffscreenEffect)
ClutterActor * clutter_texture_new_from_actor (ClutterActor *actor);
gboolean clutter_texture_set_from_file (ClutterTexture *texture, gboolean clutter_texture_set_from_file (ClutterTexture *texture,
const gchar *filename, const gchar *filename,
GError **error); GError **error);
@ -154,14 +151,6 @@ gboolean clutter_texture_set_area_from_rgb_data (ClutterTexture
ClutterTextureFlags flags, ClutterTextureFlags flags,
GError **error); GError **error);
CLUTTER_DEPRECATED
gboolean clutter_texture_set_from_yuv_data (ClutterTexture *texture,
const guchar *data,
gint width,
gint height,
ClutterTextureFlags flags,
GError **error);
void clutter_texture_get_base_size (ClutterTexture *texture, void clutter_texture_get_base_size (ClutterTexture *texture,
gint *width, gint *width,
gint *height); gint *height);

48
clutter/deprecated/clutter-texture.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Authored By Matthew Allum <mallum@openedhand.com>
*
* Copyright (C) 2006 OpenedHand
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_TEXTURE_DEPRECATED_H__
#define __CLUTTER_TEXTURE_DEPRECATED_H__
#include <clutter/clutter-texture.h>
G_BEGIN_DECLS
CLUTTER_DEPRECATED_IN_1_8_FOR(ClutterOffscreenEffect)
ClutterActor * clutter_texture_new_from_actor (ClutterActor *actor);
CLUTTER_DEPRECATED_IN_1_10
gboolean clutter_texture_set_from_yuv_data (ClutterTexture *texture,
const guchar *data,
gint width,
gint height,
ClutterTextureFlags flags,
GError **error);
G_END_DECLS
#endif /* __CLUTTER_TEXTURE_DEPRECATED_H__ */