diff options
| author | Jens Georg <mail@jensge.org> | 2015-04-17 01:22:17 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2015-06-22 23:45:54 +0200 |
| commit | 446e3a5b29a812841926e1e530c94fcf5cbfcac4 (patch) | |
| tree | 6978d4f599587b4e34ace3ac508807360477789f /src | |
| parent | 86c1d0890a3bbf0e34af08e6526692793a38f352 (diff) | |
| download | rygel-446e3a5b29a812841926e1e530c94fcf5cbfcac4.tar.gz | |
db,media-export: Move more functions
Signed-off-by: Jens Georg <mail@jensge.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/librygel-db/filelist.am | 4 | ||||
| -rw-r--r-- | src/librygel-db/sql-function.vala (renamed from src/plugins/media-export/rygel-media-export-sql-function.vala) | 2 | ||||
| -rw-r--r-- | src/librygel-db/sql-operator.vala (renamed from src/plugins/media-export/rygel-media-export-sql-operator.vala) | 4 | ||||
| -rw-r--r-- | src/plugins/media-export/Makefile.am | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/librygel-db/filelist.am b/src/librygel-db/filelist.am index 3feb5763..b0dd2548 100644 --- a/src/librygel-db/filelist.am +++ b/src/librygel-db/filelist.am @@ -2,7 +2,9 @@ LIBRYGEL_DB_VAPI_SOURCE_FILES = \ database-cursor.vala \ database.vala \ - sqlite-wrapper.vala + sql-function.vala \ + sqlite-wrapper.vala \ + sql-operator.vala LIBRYGEL_DB_NONVAPI_SOURCE_FILES = \ collate.c diff --git a/src/plugins/media-export/rygel-media-export-sql-function.vala b/src/librygel-db/sql-function.vala index 0ff0a805..499a22bf 100644 --- a/src/plugins/media-export/rygel-media-export-sql-function.vala +++ b/src/librygel-db/sql-function.vala @@ -20,7 +20,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -internal class Rygel.MediaExport.SqlFunction : SqlOperator { +public class Rygel.Database.SqlFunction : SqlOperator { public SqlFunction (string name, string arg) { base (name, arg); } diff --git a/src/plugins/media-export/rygel-media-export-sql-operator.vala b/src/librygel-db/sql-operator.vala index 3620091e..127482ca 100644 --- a/src/plugins/media-export/rygel-media-export-sql-operator.vala +++ b/src/librygel-db/sql-operator.vala @@ -22,7 +22,7 @@ using GUPnP; -internal class Rygel.MediaExport.SqlOperator : GLib.Object { +public class Rygel.Database.SqlOperator : GLib.Object { protected string name; protected string arg; protected string collate; @@ -69,5 +69,3 @@ internal class Rygel.MediaExport.SqlOperator : GLib.Object { return "(%s %s ? %s)".printf (arg, name, collate); } } - - diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am index 2bbf458b..978cb9cb 100644 --- a/src/plugins/media-export/Makefile.am +++ b/src/plugins/media-export/Makefile.am @@ -36,8 +36,6 @@ librygel_media_export_la_SOURCES = \ rygel-media-export-db-container.vala \ rygel-media-export-sql-factory.vala \ rygel-media-export-media-cache.vala \ - rygel-media-export-sql-operator.vala \ - rygel-media-export-sql-function.vala \ rygel-media-export-media-cache-upgrader.vala \ rygel-media-export-metadata-extractor.vala \ rygel-media-export-null-container.vala \ |