[grilo-plugins] all: Put all plugins in same space
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] all: Put all plugins in same space
- Date: Mon, 6 Aug 2012 16:52:31 +0000 (UTC)
commit 910399b61d64c77b22c2f2bae985775b71aaf509
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Tue Jul 24 10:54:08 2012 +0200
all: Put all plugins in same space
Now we don't keep the difference between metadata and media sources.
configure.ac | 39 ++++-----
src/Makefile.am | 84 +++++++++++++++++++-
src/{media => }/apple-trailers/Makefile.am | 0
.../apple-trailers/grl-apple-trailers.c | 0
.../apple-trailers/grl-apple-trailers.h | 0
.../apple-trailers/grl-apple-trailers.xml | 0
src/{media => }/bliptv/Makefile.am | 0
src/{media => }/bliptv/grl-bliptv.c | 0
src/{media => }/bliptv/grl-bliptv.h | 0
src/{media => }/bliptv/grl-bliptv.xml | 0
src/{media => }/bookmarks/Makefile.am | 0
src/{media => }/bookmarks/grl-bookmarks.c | 4 +-
src/{media => }/bookmarks/grl-bookmarks.h | 0
src/{media => }/bookmarks/grl-bookmarks.xml | 0
src/{metadata => }/fake-metadata/Makefile.am | 0
.../fake-metadata/grl-fake-metadata.c | 0
.../fake-metadata/grl-fake-metadata.h | 0
.../fake-metadata/grl-fake-metadata.xml | 0
src/{media => }/filesystem/Makefile.am | 0
src/{media => }/filesystem/TODO | 0
src/{media => }/filesystem/grl-filesystem.c | 0
src/{media => }/filesystem/grl-filesystem.h | 0
src/{media => }/filesystem/grl-filesystem.xml | 0
src/{media => }/flickr/Makefile.am | 0
src/{media => }/flickr/gflickr.c | 0
src/{media => }/flickr/gflickr.h | 0
src/{media => }/flickr/grl-flickr.c | 0
src/{media => }/flickr/grl-flickr.h | 0
src/{media => }/flickr/grl-flickr.xml | 0
src/{metadata => }/gravatar/Makefile.am | 0
src/{metadata => }/gravatar/grl-gravatar.c | 0
src/{metadata => }/gravatar/grl-gravatar.h | 0
src/{metadata => }/gravatar/grl-gravatar.xml | 0
src/{media => }/jamendo/Makefile.am | 0
src/{media => }/jamendo/TODO | 3 +-
src/{media => }/jamendo/grl-jamendo.c | 0
src/{media => }/jamendo/grl-jamendo.h | 0
src/{media => }/jamendo/grl-jamendo.xml | 0
src/{metadata => }/lastfm-albumart/Makefile.am | 0
.../lastfm-albumart/grl-lastfm-albumart.c | 0
.../lastfm-albumart/grl-lastfm-albumart.h | 0
.../lastfm-albumart/grl-lastfm-albumart.xml | 0
src/{metadata => }/local-metadata/Makefile.am | 0
.../local-metadata/grl-local-metadata.c | 0
.../local-metadata/grl-local-metadata.h | 0
.../local-metadata/grl-local-metadata.xml | 0
src/media/Makefile.am | 71 -----------------
src/{metadata => }/metadata-store/Makefile.am | 0
.../metadata-store/grl-metadata-store.c | 10 +-
.../metadata-store/grl-metadata-store.h | 0
.../metadata-store/grl-metadata-store.xml | 0
src/metadata/Makefile.am | 38 ---------
src/{media => }/optical-media/Makefile.am | 0
src/{media => }/optical-media/grl-optical-media.c | 0
src/{media => }/optical-media/grl-optical-media.h | 0
.../optical-media/grl-optical-media.xml | 0
src/{media => }/podcasts/Makefile.am | 0
src/{media => }/podcasts/TODO | 0
src/{media => }/podcasts/grl-podcasts.c | 2 +-
src/{media => }/podcasts/grl-podcasts.h | 0
src/{media => }/podcasts/grl-podcasts.xml | 0
src/{media => }/shoutcast/Makefile.am | 0
src/{media => }/shoutcast/grl-shoutcast.c | 0
src/{media => }/shoutcast/grl-shoutcast.h | 0
src/{media => }/shoutcast/grl-shoutcast.xml | 0
src/{media => }/tracker/Makefile.am | 0
.../tracker/grl-tracker-request-queue.c | 0
.../tracker/grl-tracker-request-queue.h | 0
src/{media => }/tracker/grl-tracker-source-api.c | 0
src/{media => }/tracker/grl-tracker-source-api.h | 0
src/{media => }/tracker/grl-tracker-source-cache.c | 0
src/{media => }/tracker/grl-tracker-source-cache.h | 0
src/{media => }/tracker/grl-tracker-source-notif.c | 0
src/{media => }/tracker/grl-tracker-source-notif.h | 0
src/{media => }/tracker/grl-tracker-source-priv.h | 0
src/{media => }/tracker/grl-tracker-source.c | 0
src/{media => }/tracker/grl-tracker-source.h | 0
src/{media => }/tracker/grl-tracker-utils.c | 0
src/{media => }/tracker/grl-tracker-utils.h | 0
src/{media => }/tracker/grl-tracker.c | 0
src/{media => }/tracker/grl-tracker.h | 0
src/{media => }/tracker/grl-tracker.xml | 0
src/{media => }/upnp/Makefile.am | 0
src/{media => }/upnp/grl-upnp.c | 0
src/{media => }/upnp/grl-upnp.h | 0
src/{media => }/upnp/grl-upnp.xml | 0
src/{media => }/vimeo/Makefile.am | 0
src/{media => }/vimeo/grl-vimeo.c | 0
src/{media => }/vimeo/grl-vimeo.h | 0
src/{media => }/vimeo/grl-vimeo.xml | 0
src/{media => }/vimeo/gvimeo.c | 0
src/{media => }/vimeo/gvimeo.h | 0
src/{media => }/youtube/Makefile.am | 0
src/{media => }/youtube/TODO | 0
src/{media => }/youtube/grl-youtube.c | 0
src/{media => }/youtube/grl-youtube.h | 0
src/{media => }/youtube/grl-youtube.xml | 0
97 files changed, 107 insertions(+), 144 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d0a6e84..68d00dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -827,27 +827,24 @@ AC_SUBST([builddir])
AC_CONFIG_FILES([
Makefile
src/Makefile
- src/media/upnp/Makefile
- src/media/vimeo/Makefile
- src/media/bookmarks/Makefile
- src/media/tracker/Makefile
- src/media/podcasts/Makefile
- src/media/jamendo/Makefile
- src/media/youtube/Makefile
- src/media/shoutcast/Makefile
- src/media/flickr/Makefile
- src/media/filesystem/Makefile
- src/media/bliptv/Makefile
- src/media/optical-media/Makefile
- src/media/Makefile
- src/media/apple-trailers/Makefile
- src/metadata/metadata-store/Makefile
- src/metadata/gravatar/Makefile
- src/metadata/lastfm-albumart/Makefile
- src/metadata/fake-metadata/Makefile
- src/metadata/Makefile
- src/metadata/local-metadata/Makefile
- test/Makefile
+ src/apple-trailers/Makefile
+ src/bliptv/Makefile
+ src/bookmarks/Makefile
+ src/fake-metadata/Makefile
+ src/filesystem/Makefile
+ src/flickr/Makefile
+ src/gravatar/Makefile
+ src/jamendo/Makefile
+ src/lastfm-albumart/Makefile
+ src/local-metadata/Makefile
+ src/metadata-store/Makefile
+ src/optical-media/Makefile
+ src/podcasts/Makefile
+ src/shoutcast/Makefile
+ src/tracker/Makefile
+ src/upnp/Makefile
+ src/vimeo/Makefile
+ src/youtube/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 7db9d58..2089369 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,89 @@
#
# Makefile.am
#
-# Author: Guillaume Emont <gemont igalia com>
+# Authors: Iago Toral Quiroga <itoral igalia com>
+# Guillaume Emont <gemont igalia com>
#
-# Copyright (C) 2010, 2011 Igalia S.L. All rights reserved.
+# Copyright (C) 2010-2012 Igalia S.L. All rights reserved.
-SUBDIRS = media metadata
+SUBDIRS =
-DIST_SUBDIRS = media metadata
+if APPLE_TRAILERS_PLUGIN
+SUBDIRS += apple-trailers
+endif
+
+if BLIPTV_PLUGIN
+SUBDIRS += bliptv
+endif
+
+if BOOKMARKS_PLUGIN
+SUBDIRS += bookmarks
+endif
+
+if FAKEMETADATA_PLUGIN
+SUBDIRS += fake-metadata
+endif
+
+if FILESYSTEM_PLUGIN
+SUBDIRS += filesystem
+endif
+
+if FLICKR_PLUGIN
+SUBDIRS += flickr
+endif
+
+if GRAVATAR_PLUGIN
+SUBDIRS += gravatar
+endif
+
+if JAMENDO_PLUGIN
+SUBDIRS += jamendo
+endif
+
+if LASTFM_ALBUMART_PLUGIN
+SUBDIRS += lastfm-albumart
+endif
+
+if LOCALMETADATA_PLUGIN
+SUBDIRS += local-metadata
+endif
+
+if METADATA_STORE_PLUGIN
+SUBDIRS += metadata-store
+endif
+
+if OPTICAL_MEDIA_PLUGIN
+SUBDIRS += optical-media
+endif
+
+if PODCASTS_PLUGIN
+SUBDIRS += podcasts
+endif
+
+if SHOUTCAST_PLUGIN
+SUBDIRS += shoutcast
+endif
+
+if TRACKER_PLUGIN
+SUBDIRS += tracker
+endif
+
+if UPNP_PLUGIN
+SUBDIRS += upnp
+endif
+
+if VIMEO_PLUGIN
+SUBDIRS += vimeo
+endif
+
+if YOUTUBE_PLUGIN
+SUBDIRS += youtube
+endif
+
+DIST_SUBDIRS = \
+ apple-trailers bliptv bookmarks fake-metadata filesystem flickr \
+ gravatar jamendo lastfm-albumart local-metadata metadata-store \
+ optical-media podcasts shoutcast tracker upnp vimeo youtube
MAINTAINERCLEANFILES = \
*.in \
diff --git a/src/media/apple-trailers/Makefile.am b/src/apple-trailers/Makefile.am
similarity index 100%
rename from src/media/apple-trailers/Makefile.am
rename to src/apple-trailers/Makefile.am
diff --git a/src/media/apple-trailers/grl-apple-trailers.c b/src/apple-trailers/grl-apple-trailers.c
similarity index 100%
rename from src/media/apple-trailers/grl-apple-trailers.c
rename to src/apple-trailers/grl-apple-trailers.c
diff --git a/src/media/apple-trailers/grl-apple-trailers.h b/src/apple-trailers/grl-apple-trailers.h
similarity index 100%
rename from src/media/apple-trailers/grl-apple-trailers.h
rename to src/apple-trailers/grl-apple-trailers.h
diff --git a/src/media/apple-trailers/grl-apple-trailers.xml b/src/apple-trailers/grl-apple-trailers.xml
similarity index 100%
rename from src/media/apple-trailers/grl-apple-trailers.xml
rename to src/apple-trailers/grl-apple-trailers.xml
diff --git a/src/media/bliptv/Makefile.am b/src/bliptv/Makefile.am
similarity index 100%
rename from src/media/bliptv/Makefile.am
rename to src/bliptv/Makefile.am
diff --git a/src/media/bliptv/grl-bliptv.c b/src/bliptv/grl-bliptv.c
similarity index 100%
rename from src/media/bliptv/grl-bliptv.c
rename to src/bliptv/grl-bliptv.c
diff --git a/src/media/bliptv/grl-bliptv.h b/src/bliptv/grl-bliptv.h
similarity index 100%
rename from src/media/bliptv/grl-bliptv.h
rename to src/bliptv/grl-bliptv.h
diff --git a/src/media/bliptv/grl-bliptv.xml b/src/bliptv/grl-bliptv.xml
similarity index 100%
rename from src/media/bliptv/grl-bliptv.xml
rename to src/bliptv/grl-bliptv.xml
diff --git a/src/media/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
similarity index 100%
rename from src/media/bookmarks/Makefile.am
rename to src/bookmarks/Makefile.am
diff --git a/src/media/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c
similarity index 99%
rename from src/media/bookmarks/grl-bookmarks.c
rename to src/bookmarks/grl-bookmarks.c
index 5563563..f2545e5 100644
--- a/src/media/bookmarks/grl-bookmarks.c
+++ b/src/bookmarks/grl-bookmarks.c
@@ -536,7 +536,7 @@ produce_bookmarks_by_query (OperationSpec *os, const gchar *query)
gchar *sql;
GRL_DEBUG ("produce_bookmarks_by_query");
sql = g_strdup_printf (GRL_SQL_GET_BOOKMARKS_BY_QUERY,
- query, os->count, os->skip);
+ query, os->count, os->skip);
produce_bookmarks_from_sql (os, sql);
g_free (sql);
}
@@ -561,7 +561,7 @@ produce_bookmarks_from_category (OperationSpec *os, const gchar *category_id)
gchar *sql;
GRL_DEBUG ("produce_bookmarks_from_category");
sql = g_strdup_printf (GRL_SQL_GET_BOOKMARKS_BY_PARENT,
- category_id, os->count, os->skip);
+ category_id, os->count, os->skip);
produce_bookmarks_from_sql (os, sql);
g_free (sql);
}
diff --git a/src/media/bookmarks/grl-bookmarks.h b/src/bookmarks/grl-bookmarks.h
similarity index 100%
rename from src/media/bookmarks/grl-bookmarks.h
rename to src/bookmarks/grl-bookmarks.h
diff --git a/src/media/bookmarks/grl-bookmarks.xml b/src/bookmarks/grl-bookmarks.xml
similarity index 100%
rename from src/media/bookmarks/grl-bookmarks.xml
rename to src/bookmarks/grl-bookmarks.xml
diff --git a/src/metadata/fake-metadata/Makefile.am b/src/fake-metadata/Makefile.am
similarity index 100%
rename from src/metadata/fake-metadata/Makefile.am
rename to src/fake-metadata/Makefile.am
diff --git a/src/metadata/fake-metadata/grl-fake-metadata.c b/src/fake-metadata/grl-fake-metadata.c
similarity index 100%
rename from src/metadata/fake-metadata/grl-fake-metadata.c
rename to src/fake-metadata/grl-fake-metadata.c
diff --git a/src/metadata/fake-metadata/grl-fake-metadata.h b/src/fake-metadata/grl-fake-metadata.h
similarity index 100%
rename from src/metadata/fake-metadata/grl-fake-metadata.h
rename to src/fake-metadata/grl-fake-metadata.h
diff --git a/src/metadata/fake-metadata/grl-fake-metadata.xml b/src/fake-metadata/grl-fake-metadata.xml
similarity index 100%
rename from src/metadata/fake-metadata/grl-fake-metadata.xml
rename to src/fake-metadata/grl-fake-metadata.xml
diff --git a/src/media/filesystem/Makefile.am b/src/filesystem/Makefile.am
similarity index 100%
rename from src/media/filesystem/Makefile.am
rename to src/filesystem/Makefile.am
diff --git a/src/media/filesystem/TODO b/src/filesystem/TODO
similarity index 100%
rename from src/media/filesystem/TODO
rename to src/filesystem/TODO
diff --git a/src/media/filesystem/grl-filesystem.c b/src/filesystem/grl-filesystem.c
similarity index 100%
rename from src/media/filesystem/grl-filesystem.c
rename to src/filesystem/grl-filesystem.c
diff --git a/src/media/filesystem/grl-filesystem.h b/src/filesystem/grl-filesystem.h
similarity index 100%
rename from src/media/filesystem/grl-filesystem.h
rename to src/filesystem/grl-filesystem.h
diff --git a/src/media/filesystem/grl-filesystem.xml b/src/filesystem/grl-filesystem.xml
similarity index 100%
rename from src/media/filesystem/grl-filesystem.xml
rename to src/filesystem/grl-filesystem.xml
diff --git a/src/media/flickr/Makefile.am b/src/flickr/Makefile.am
similarity index 100%
rename from src/media/flickr/Makefile.am
rename to src/flickr/Makefile.am
diff --git a/src/media/flickr/gflickr.c b/src/flickr/gflickr.c
similarity index 100%
rename from src/media/flickr/gflickr.c
rename to src/flickr/gflickr.c
diff --git a/src/media/flickr/gflickr.h b/src/flickr/gflickr.h
similarity index 100%
rename from src/media/flickr/gflickr.h
rename to src/flickr/gflickr.h
diff --git a/src/media/flickr/grl-flickr.c b/src/flickr/grl-flickr.c
similarity index 100%
rename from src/media/flickr/grl-flickr.c
rename to src/flickr/grl-flickr.c
diff --git a/src/media/flickr/grl-flickr.h b/src/flickr/grl-flickr.h
similarity index 100%
rename from src/media/flickr/grl-flickr.h
rename to src/flickr/grl-flickr.h
diff --git a/src/media/flickr/grl-flickr.xml b/src/flickr/grl-flickr.xml
similarity index 100%
rename from src/media/flickr/grl-flickr.xml
rename to src/flickr/grl-flickr.xml
diff --git a/src/metadata/gravatar/Makefile.am b/src/gravatar/Makefile.am
similarity index 100%
rename from src/metadata/gravatar/Makefile.am
rename to src/gravatar/Makefile.am
diff --git a/src/metadata/gravatar/grl-gravatar.c b/src/gravatar/grl-gravatar.c
similarity index 100%
rename from src/metadata/gravatar/grl-gravatar.c
rename to src/gravatar/grl-gravatar.c
diff --git a/src/metadata/gravatar/grl-gravatar.h b/src/gravatar/grl-gravatar.h
similarity index 100%
rename from src/metadata/gravatar/grl-gravatar.h
rename to src/gravatar/grl-gravatar.h
diff --git a/src/metadata/gravatar/grl-gravatar.xml b/src/gravatar/grl-gravatar.xml
similarity index 100%
rename from src/metadata/gravatar/grl-gravatar.xml
rename to src/gravatar/grl-gravatar.xml
diff --git a/src/media/jamendo/Makefile.am b/src/jamendo/Makefile.am
similarity index 100%
rename from src/media/jamendo/Makefile.am
rename to src/jamendo/Makefile.am
diff --git a/src/media/jamendo/TODO b/src/jamendo/TODO
similarity index 99%
rename from src/media/jamendo/TODO
rename to src/jamendo/TODO
index 2571947..cfca74d 100644
--- a/src/media/jamendo/TODO
+++ b/src/jamendo/TODO
@@ -2,7 +2,7 @@ Get global database and work locally
====================================
Actually all queries are on-line. But the whole database can be retrieved and
stored in local, so all operation can be performed off-line.
-
+
Doing it requires to implement the search in local. We should explore if either
moving to this approach or even creating a new derivative plugin that follows
this off-line approach worths it.
@@ -27,4 +27,3 @@ User can request any arbitrary number of elements, and this request is propagate
Nevertheless, it would be better to break the request in smaller chunks, so
though user requests, for instance, 1000 albums, we do the query in steps of 25
elements.
-
diff --git a/src/media/jamendo/grl-jamendo.c b/src/jamendo/grl-jamendo.c
similarity index 100%
rename from src/media/jamendo/grl-jamendo.c
rename to src/jamendo/grl-jamendo.c
diff --git a/src/media/jamendo/grl-jamendo.h b/src/jamendo/grl-jamendo.h
similarity index 100%
rename from src/media/jamendo/grl-jamendo.h
rename to src/jamendo/grl-jamendo.h
diff --git a/src/media/jamendo/grl-jamendo.xml b/src/jamendo/grl-jamendo.xml
similarity index 100%
rename from src/media/jamendo/grl-jamendo.xml
rename to src/jamendo/grl-jamendo.xml
diff --git a/src/metadata/lastfm-albumart/Makefile.am b/src/lastfm-albumart/Makefile.am
similarity index 100%
rename from src/metadata/lastfm-albumart/Makefile.am
rename to src/lastfm-albumart/Makefile.am
diff --git a/src/metadata/lastfm-albumart/grl-lastfm-albumart.c b/src/lastfm-albumart/grl-lastfm-albumart.c
similarity index 100%
rename from src/metadata/lastfm-albumart/grl-lastfm-albumart.c
rename to src/lastfm-albumart/grl-lastfm-albumart.c
diff --git a/src/metadata/lastfm-albumart/grl-lastfm-albumart.h b/src/lastfm-albumart/grl-lastfm-albumart.h
similarity index 100%
rename from src/metadata/lastfm-albumart/grl-lastfm-albumart.h
rename to src/lastfm-albumart/grl-lastfm-albumart.h
diff --git a/src/metadata/lastfm-albumart/grl-lastfm-albumart.xml b/src/lastfm-albumart/grl-lastfm-albumart.xml
similarity index 100%
rename from src/metadata/lastfm-albumart/grl-lastfm-albumart.xml
rename to src/lastfm-albumart/grl-lastfm-albumart.xml
diff --git a/src/metadata/local-metadata/Makefile.am b/src/local-metadata/Makefile.am
similarity index 100%
rename from src/metadata/local-metadata/Makefile.am
rename to src/local-metadata/Makefile.am
diff --git a/src/metadata/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c
similarity index 100%
rename from src/metadata/local-metadata/grl-local-metadata.c
rename to src/local-metadata/grl-local-metadata.c
diff --git a/src/metadata/local-metadata/grl-local-metadata.h b/src/local-metadata/grl-local-metadata.h
similarity index 100%
rename from src/metadata/local-metadata/grl-local-metadata.h
rename to src/local-metadata/grl-local-metadata.h
diff --git a/src/metadata/local-metadata/grl-local-metadata.xml b/src/local-metadata/grl-local-metadata.xml
similarity index 100%
rename from src/metadata/local-metadata/grl-local-metadata.xml
rename to src/local-metadata/grl-local-metadata.xml
diff --git a/src/metadata/metadata-store/Makefile.am b/src/metadata-store/Makefile.am
similarity index 100%
rename from src/metadata/metadata-store/Makefile.am
rename to src/metadata-store/Makefile.am
diff --git a/src/metadata/metadata-store/grl-metadata-store.c b/src/metadata-store/grl-metadata-store.c
similarity index 99%
rename from src/metadata/metadata-store/grl-metadata-store.c
rename to src/metadata-store/grl-metadata-store.c
index 56318e1..ac3559a 100644
--- a/src/metadata/metadata-store/grl-metadata-store.c
+++ b/src/metadata-store/grl-metadata-store.c
@@ -489,7 +489,7 @@ write_keys (sqlite3 *db,
col_names,
sms->keys,
sms->media);
-
+
if (!r) {
GRL_WARNING ("Failed to update metadata for '%s - %s': %s",
source_id, media_id, sqlite3_errmsg (db));
@@ -499,8 +499,8 @@ write_keys (sqlite3 *db,
GRL_CORE_ERROR_STORE_METADATA_FAILED,
"Failed to update metadata");
goto done;
- }
-
+ }
+
if (sqlite3_changes (db) == 0) {
/* We have to create the row */
r = prepare_and_exec_insert (db,
@@ -520,7 +520,7 @@ write_keys (sqlite3 *db,
GRL_CORE_ERROR_STORE_METADATA_FAILED,
"Failed to update metadata");
goto done;
- }
+ }
done:
g_list_free (col_names);
@@ -654,7 +654,7 @@ grl_metadata_store_source_store_metadata (GrlSource *source,
if (!media_id) {
media_id = "";
}
-
+
failed_keys = write_keys (GRL_METADATA_STORE_SOURCE (source)->priv->db,
source_id, media_id, sms, &error);
}
diff --git a/src/metadata/metadata-store/grl-metadata-store.h b/src/metadata-store/grl-metadata-store.h
similarity index 100%
rename from src/metadata/metadata-store/grl-metadata-store.h
rename to src/metadata-store/grl-metadata-store.h
diff --git a/src/metadata/metadata-store/grl-metadata-store.xml b/src/metadata-store/grl-metadata-store.xml
similarity index 100%
rename from src/metadata/metadata-store/grl-metadata-store.xml
rename to src/metadata-store/grl-metadata-store.xml
diff --git a/src/media/optical-media/Makefile.am b/src/optical-media/Makefile.am
similarity index 100%
rename from src/media/optical-media/Makefile.am
rename to src/optical-media/Makefile.am
diff --git a/src/media/optical-media/grl-optical-media.c b/src/optical-media/grl-optical-media.c
similarity index 100%
rename from src/media/optical-media/grl-optical-media.c
rename to src/optical-media/grl-optical-media.c
diff --git a/src/media/optical-media/grl-optical-media.h b/src/optical-media/grl-optical-media.h
similarity index 100%
rename from src/media/optical-media/grl-optical-media.h
rename to src/optical-media/grl-optical-media.h
diff --git a/src/media/optical-media/grl-optical-media.xml b/src/optical-media/grl-optical-media.xml
similarity index 100%
rename from src/media/optical-media/grl-optical-media.xml
rename to src/optical-media/grl-optical-media.xml
diff --git a/src/media/podcasts/Makefile.am b/src/podcasts/Makefile.am
similarity index 100%
rename from src/media/podcasts/Makefile.am
rename to src/podcasts/Makefile.am
diff --git a/src/media/podcasts/TODO b/src/podcasts/TODO
similarity index 100%
rename from src/media/podcasts/TODO
rename to src/podcasts/TODO
diff --git a/src/media/podcasts/grl-podcasts.c b/src/podcasts/grl-podcasts.c
similarity index 99%
rename from src/media/podcasts/grl-podcasts.c
rename to src/podcasts/grl-podcasts.c
index b273de3..6a2711c 100644
--- a/src/media/podcasts/grl-podcasts.c
+++ b/src/podcasts/grl-podcasts.c
@@ -1246,7 +1246,7 @@ parse_feed (OperationSpec *os, const gchar *str, GError **error)
"Failed to parse podcast contents");
goto free_resources;
}
-
+
podcast_data = parse_podcast_data (doc, xpathObj);
xmlXPathFreeObject (xpathObj);
xpathObj = NULL;
diff --git a/src/media/podcasts/grl-podcasts.h b/src/podcasts/grl-podcasts.h
similarity index 100%
rename from src/media/podcasts/grl-podcasts.h
rename to src/podcasts/grl-podcasts.h
diff --git a/src/media/podcasts/grl-podcasts.xml b/src/podcasts/grl-podcasts.xml
similarity index 100%
rename from src/media/podcasts/grl-podcasts.xml
rename to src/podcasts/grl-podcasts.xml
diff --git a/src/media/shoutcast/Makefile.am b/src/shoutcast/Makefile.am
similarity index 100%
rename from src/media/shoutcast/Makefile.am
rename to src/shoutcast/Makefile.am
diff --git a/src/media/shoutcast/grl-shoutcast.c b/src/shoutcast/grl-shoutcast.c
similarity index 100%
rename from src/media/shoutcast/grl-shoutcast.c
rename to src/shoutcast/grl-shoutcast.c
diff --git a/src/media/shoutcast/grl-shoutcast.h b/src/shoutcast/grl-shoutcast.h
similarity index 100%
rename from src/media/shoutcast/grl-shoutcast.h
rename to src/shoutcast/grl-shoutcast.h
diff --git a/src/media/shoutcast/grl-shoutcast.xml b/src/shoutcast/grl-shoutcast.xml
similarity index 100%
rename from src/media/shoutcast/grl-shoutcast.xml
rename to src/shoutcast/grl-shoutcast.xml
diff --git a/src/media/tracker/Makefile.am b/src/tracker/Makefile.am
similarity index 100%
rename from src/media/tracker/Makefile.am
rename to src/tracker/Makefile.am
diff --git a/src/media/tracker/grl-tracker-request-queue.c b/src/tracker/grl-tracker-request-queue.c
similarity index 100%
rename from src/media/tracker/grl-tracker-request-queue.c
rename to src/tracker/grl-tracker-request-queue.c
diff --git a/src/media/tracker/grl-tracker-request-queue.h b/src/tracker/grl-tracker-request-queue.h
similarity index 100%
rename from src/media/tracker/grl-tracker-request-queue.h
rename to src/tracker/grl-tracker-request-queue.h
diff --git a/src/media/tracker/grl-tracker-source-api.c b/src/tracker/grl-tracker-source-api.c
similarity index 100%
rename from src/media/tracker/grl-tracker-source-api.c
rename to src/tracker/grl-tracker-source-api.c
diff --git a/src/media/tracker/grl-tracker-source-api.h b/src/tracker/grl-tracker-source-api.h
similarity index 100%
rename from src/media/tracker/grl-tracker-source-api.h
rename to src/tracker/grl-tracker-source-api.h
diff --git a/src/media/tracker/grl-tracker-source-cache.c b/src/tracker/grl-tracker-source-cache.c
similarity index 100%
rename from src/media/tracker/grl-tracker-source-cache.c
rename to src/tracker/grl-tracker-source-cache.c
diff --git a/src/media/tracker/grl-tracker-source-cache.h b/src/tracker/grl-tracker-source-cache.h
similarity index 100%
rename from src/media/tracker/grl-tracker-source-cache.h
rename to src/tracker/grl-tracker-source-cache.h
diff --git a/src/media/tracker/grl-tracker-source-notif.c b/src/tracker/grl-tracker-source-notif.c
similarity index 100%
rename from src/media/tracker/grl-tracker-source-notif.c
rename to src/tracker/grl-tracker-source-notif.c
diff --git a/src/media/tracker/grl-tracker-source-notif.h b/src/tracker/grl-tracker-source-notif.h
similarity index 100%
rename from src/media/tracker/grl-tracker-source-notif.h
rename to src/tracker/grl-tracker-source-notif.h
diff --git a/src/media/tracker/grl-tracker-source-priv.h b/src/tracker/grl-tracker-source-priv.h
similarity index 100%
rename from src/media/tracker/grl-tracker-source-priv.h
rename to src/tracker/grl-tracker-source-priv.h
diff --git a/src/media/tracker/grl-tracker-source.c b/src/tracker/grl-tracker-source.c
similarity index 100%
rename from src/media/tracker/grl-tracker-source.c
rename to src/tracker/grl-tracker-source.c
diff --git a/src/media/tracker/grl-tracker-source.h b/src/tracker/grl-tracker-source.h
similarity index 100%
rename from src/media/tracker/grl-tracker-source.h
rename to src/tracker/grl-tracker-source.h
diff --git a/src/media/tracker/grl-tracker-utils.c b/src/tracker/grl-tracker-utils.c
similarity index 100%
rename from src/media/tracker/grl-tracker-utils.c
rename to src/tracker/grl-tracker-utils.c
diff --git a/src/media/tracker/grl-tracker-utils.h b/src/tracker/grl-tracker-utils.h
similarity index 100%
rename from src/media/tracker/grl-tracker-utils.h
rename to src/tracker/grl-tracker-utils.h
diff --git a/src/media/tracker/grl-tracker.c b/src/tracker/grl-tracker.c
similarity index 100%
rename from src/media/tracker/grl-tracker.c
rename to src/tracker/grl-tracker.c
diff --git a/src/media/tracker/grl-tracker.h b/src/tracker/grl-tracker.h
similarity index 100%
rename from src/media/tracker/grl-tracker.h
rename to src/tracker/grl-tracker.h
diff --git a/src/media/tracker/grl-tracker.xml b/src/tracker/grl-tracker.xml
similarity index 100%
rename from src/media/tracker/grl-tracker.xml
rename to src/tracker/grl-tracker.xml
diff --git a/src/media/upnp/Makefile.am b/src/upnp/Makefile.am
similarity index 100%
rename from src/media/upnp/Makefile.am
rename to src/upnp/Makefile.am
diff --git a/src/media/upnp/grl-upnp.c b/src/upnp/grl-upnp.c
similarity index 100%
rename from src/media/upnp/grl-upnp.c
rename to src/upnp/grl-upnp.c
diff --git a/src/media/upnp/grl-upnp.h b/src/upnp/grl-upnp.h
similarity index 100%
rename from src/media/upnp/grl-upnp.h
rename to src/upnp/grl-upnp.h
diff --git a/src/media/upnp/grl-upnp.xml b/src/upnp/grl-upnp.xml
similarity index 100%
rename from src/media/upnp/grl-upnp.xml
rename to src/upnp/grl-upnp.xml
diff --git a/src/media/vimeo/Makefile.am b/src/vimeo/Makefile.am
similarity index 100%
rename from src/media/vimeo/Makefile.am
rename to src/vimeo/Makefile.am
diff --git a/src/media/vimeo/grl-vimeo.c b/src/vimeo/grl-vimeo.c
similarity index 100%
rename from src/media/vimeo/grl-vimeo.c
rename to src/vimeo/grl-vimeo.c
diff --git a/src/media/vimeo/grl-vimeo.h b/src/vimeo/grl-vimeo.h
similarity index 100%
rename from src/media/vimeo/grl-vimeo.h
rename to src/vimeo/grl-vimeo.h
diff --git a/src/media/vimeo/grl-vimeo.xml b/src/vimeo/grl-vimeo.xml
similarity index 100%
rename from src/media/vimeo/grl-vimeo.xml
rename to src/vimeo/grl-vimeo.xml
diff --git a/src/media/vimeo/gvimeo.c b/src/vimeo/gvimeo.c
similarity index 100%
rename from src/media/vimeo/gvimeo.c
rename to src/vimeo/gvimeo.c
diff --git a/src/media/vimeo/gvimeo.h b/src/vimeo/gvimeo.h
similarity index 100%
rename from src/media/vimeo/gvimeo.h
rename to src/vimeo/gvimeo.h
diff --git a/src/media/youtube/Makefile.am b/src/youtube/Makefile.am
similarity index 100%
rename from src/media/youtube/Makefile.am
rename to src/youtube/Makefile.am
diff --git a/src/media/youtube/TODO b/src/youtube/TODO
similarity index 100%
rename from src/media/youtube/TODO
rename to src/youtube/TODO
diff --git a/src/media/youtube/grl-youtube.c b/src/youtube/grl-youtube.c
similarity index 100%
rename from src/media/youtube/grl-youtube.c
rename to src/youtube/grl-youtube.c
diff --git a/src/media/youtube/grl-youtube.h b/src/youtube/grl-youtube.h
similarity index 100%
rename from src/media/youtube/grl-youtube.h
rename to src/youtube/grl-youtube.h
diff --git a/src/media/youtube/grl-youtube.xml b/src/youtube/grl-youtube.xml
similarity index 100%
rename from src/media/youtube/grl-youtube.xml
rename to src/youtube/grl-youtube.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
