GESAssetLoadingReturn cannot be internal

The enumeration is referenced in a public API.

diff --git a/ges/Makefile.am b/ges/Makefile.am
index e023e1d..6d877d6 100644 (file)
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -119,8 +119,7 @@ libges_@GST_API_VERSION@include_HEADERS =   \
 
 noinst_HEADERS = \
        ges-internal.h \
-       ges-auto-transition.h \
-       ges-internal-enums.h
+       ges-auto-transition.h
 
 libges_@GST_API_VERSION@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) \
                $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \

diff --git a/ges/ges-asset.h b/ges/ges-asset.h
index 2232e06..e4b2189 100644 (file)
--- a/ges/ges-asset.h
+++ b/ges/ges-asset.h
@@ -22,8 +22,6 @@
 #ifndef _GES_ASSET_
 #define _GES_ASSET_
 
-#include "ges-internal-enums.h"
-
 #include <glib-object.h>
 #include <ges/ges-types.h>
 #include <ges/ges-enums.h>
@@ -43,6 +41,13 @@ G_BEGIN_DECLS
 #define GES_ASSET_GET_CLASS(obj) \
     (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;
 
 GType ges_asset_get_type (void);

diff --git a/ges/ges-internal-enums.h b/ges/ges-internal-enums.h
deleted file mode 100644 (file)
index fde0e6d..0000000
--- a/ges/ges-internal-enums.h
+++ /dev/null
@@ -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__ */