mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-09 00:45:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

GESAssetLoadingReturn cannot be internal

Browse source 
The enumeration is referenced in a public API.
This commit is contained in:
Nicolas Dufresne 2013-03-05 17:07:29 -05:00 committed by Thibault Saunier
parent ef4efa505f
commit 13fb847255
3 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ges/Makefile.am
View file

@ -119,8 +119,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
noinst_HEADERS = \ noinst_HEADERS = \
ges-internal.h \ ges-internal.h \
ges-auto-transition.h \ ges-auto-transition.h
ges-internal-enums.h
libges_@GST_API_VERSION@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) \ libges_@GST_API_VERSION@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) \
$(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \

9
ges/ges-asset.h
View file

@ -22,8 +22,6 @@
#ifndef _GES_ASSET_ #ifndef _GES_ASSET_
#define _GES_ASSET_ #define _GES_ASSET_
#include "ges-internal-enums.h"
#include <glib-object.h> #include <glib-object.h>
#include <ges/ges-types.h> #include <ges/ges-types.h>
#include <ges/ges-enums.h> #include <ges/ges-enums.h>
@ -43,6 +41,13 @@ G_BEGIN_DECLS
#define GES_ASSET_GET_CLASS(obj) \ #define GES_ASSET_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_ASSET, GESAssetClass)) (G_TYPE_INSTANCE_GET_CLASS ((obj), GES_TYPE_ASSET, GESAssetClass))
typedef enum
{
GES_ASSET_LOADING_ERROR,
GES_ASSET_LOADING_ASYNC,
GES_ASSET_LOADING_OK
} GESAssetLoadingReturn;
typedef struct _GESAssetPrivate GESAssetPrivate; typedef struct _GESAssetPrivate GESAssetPrivate;
GType ges_asset_get_type (void); GType ges_asset_get_type (void);

31
ges/ges-internal-enums.h
View file

@ -1,31 +0,0 @@
/* GStreamer Editing Services
*
* Copyright (C) 2012 Thibault Saunier <thibault.saunier@collabora.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 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
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __GES_INTERNAL_ENUMS_H__
#define __GES_INTERNAL_ENUMS_H__
typedef enum
{
GES_ASSET_LOADING_ERROR,
GES_ASSET_LOADING_ASYNC,
GES_ASSET_LOADING_OK
} GESAssetLoadingReturn;
#endif /* __GES_INTERNAL_ENUMS_H__ */