[libmediaart/api-cleanup: 7/14] extract: Switch to initable MediaArtProcess object from _init/_shutdown()
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libmediaart/api-cleanup: 7/14] extract: Switch to initable MediaArtProcess object from _init/_shutdown()
- Date: Tue, 25 Feb 2014 18:36:41 +0000 (UTC)
commit da1b193f1dba6aefac81810b2ed942ecc340100e
Author: Martyn Russell <martyn lanedo com>
Date: Tue Feb 25 12:03:25 2014 +0000
extract: Switch to initable MediaArtProcess object from _init/_shutdown()
libmediaart/extract.c | 329 ++++++++++++++++++++++++++++++-------------------
libmediaart/extract.h | 65 ++++++++---
tests/mediaarttest.c | 100 ++++++++++-----
3 files changed, 319 insertions(+), 175 deletions(-)
---
diff --git a/libmediaart/extract.c b/libmediaart/extract.c
index 0df085e..c421678 100644
--- a/libmediaart/extract.c
+++ b/libmediaart/extract.c
@@ -71,6 +71,14 @@
* and call media_art_shutdown() to free the resources it uses.
**/
+typedef struct {
+ gboolean disable_requests;
+
+ GHashTable *media_art_cache;
+ GDBusConnection *connection;
+ Storage *storage;
+} MediaArtProcessPrivate;
+
static const gchar *media_art_type_name[MEDIA_ART_TYPE_COUNT] = {
"invalid",
"album",
@@ -78,6 +86,7 @@ static const gchar *media_art_type_name[MEDIA_ART_TYPE_COUNT] = {
};
typedef struct {
+ MediaArtProcess *process;
gchar *art_path;
gchar *local_uri;
} FileInfo;
@@ -96,16 +105,128 @@ typedef enum {
IMAGE_MATCH_TYPE_COUNT
} ImageMatchType;
-static gboolean initialized = FALSE;
-static gboolean disable_requests;
+static void media_art_queue_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data);
+static void media_art_process_initable_iface_init (GInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (MediaArtProcess, media_art_process, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
+ media_art_process_initable_iface_init)
+ G_ADD_PRIVATE (MediaArtProcess))
+
+static void
+media_art_process_finalize (GObject *object)
+{
+ MediaArtProcessPrivate *private;
+ MediaArtProcess *process;
+
+ process = MEDIA_ART_PROCESS (object);
+ private = media_art_process_get_instance_private (process);
+
+ if (private->storage) {
+ g_object_unref (private->storage);
+ }
+
+ if (private->connection) {
+ g_object_unref (private->connection);
+ }
+
+ if (private->media_art_cache) {
+ g_hash_table_unref (private->media_art_cache);
+ }
+
+ media_art_plugin_shutdown ();
+
+ G_OBJECT_CLASS (media_art_process_parent_class)->finalize (object);
+}
+
+static gboolean
+media_art_process_initable_init (GInitable *initable,
+ GCancellable *cancellable,
+ GError **error)
+{
+ MediaArtProcessPrivate *private;
+ MediaArtProcess *process;
+ GError *local_error = NULL;
+
+ process = MEDIA_ART_PROCESS (initable);
+ private = media_art_process_get_instance_private (process);
+
+ g_debug ("Initializing media art processing requirements...");
+
+ media_art_plugin_init (0);
+
+ /* Cache to know if we have already handled uris */
+ private->media_art_cache = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ (GDestroyNotify) g_free,
+ NULL);
+
+ /* Signal handler for new album art from the extractor */
+ private->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &local_error);
+
+ if (!private->connection) {
+ g_critical ("Could not connect to the D-Bus session bus, %s",
+ local_error ? local_error->message : "no error given.");
+ g_propagate_error (error, local_error);
+
+ return FALSE;
+ }
+
+ private->storage = storage_new ();
+ if (!private->storage) {
+ g_critical ("Could not start storage module for removable media detection");
+
+ if (error) {
+ *error = g_error_new (MEDIA_ART_ERROR,
+ MEDIA_ART_ERROR_NO_STORAGE,
+ "Could not initialize storage module");
+ }
+
+ return FALSE;
+ }
-static GHashTable *media_art_cache;
-static GDBusConnection *connection;
-static Storage *storage;
+ return TRUE;
+}
-static void media_art_queue_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data);
+static void
+media_art_process_initable_iface_init (GInitableIface *iface)
+{
+ iface->init = media_art_process_initable_init;
+}
+
+static void
+media_art_process_class_init (MediaArtProcessClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = media_art_process_finalize;
+}
+
+static void
+media_art_process_init (MediaArtProcess *thumbnailer)
+{
+}
+
+/**
+ * media_art_process_new:
+ * @error: Pointer to potential GLib / MediaArt error, or %NULL
+ *
+ * Initialize a GObject for processing and extracting media art.
+ *
+ * This function initializes cache hash tables, backend plugins,
+ * storage modules used for removable devices and a connection to D-Bus.
+ *
+ * Returns: %TRUE on success or %FALSE if @error is set.
+ *
+ * Since: 0.3.0
+ */
+MediaArtProcess *
+media_art_process_new (GError **error)
+{
+ return g_initable_new (MEDIA_ART_TYPE_PROCESS, NULL, error, NULL);
+}
static GDir *
get_parent_g_dir (const gchar *uri,
@@ -142,7 +263,6 @@ get_parent_g_dir (const gchar *uri,
return dir;
}
-
static gchar *
checksum_for_data (GChecksumType checksum_type,
const guchar *data,
@@ -1007,13 +1127,15 @@ media_art_set (const unsigned char *buffer,
}
static FileInfo *
-file_info_new (const gchar *local_uri,
- const gchar *art_path)
+file_info_new (MediaArtProcess *process,
+ const gchar *local_uri,
+ const gchar *art_path)
{
FileInfo *fi;
fi = g_slice_new (FileInfo);
+ fi->process = g_object_ref (process);
fi->local_uri = g_strdup (local_uri);
fi->art_path = g_strdup (art_path);
@@ -1023,23 +1145,33 @@ file_info_new (const gchar *local_uri,
static void
file_info_free (FileInfo *fi)
{
+ if (!fi) {
+ return;
+ }
+
g_free (fi->local_uri);
g_free (fi->art_path);
+ g_object_unref (fi->process);
g_slice_free (FileInfo, fi);
}
static void
-media_art_request_download (MediaArtType type,
- const gchar *album,
- const gchar *artist,
- const gchar *local_uri,
- const gchar *art_path)
+media_art_request_download (MediaArtProcess *process,
+ MediaArtType type,
+ const gchar *album,
+ const gchar *artist,
+ const gchar *local_uri,
+ const gchar *art_path)
{
- if (connection) {
+ MediaArtProcessPrivate *private;
+
+ private = media_art_process_get_instance_private (process);
+
+ if (private->connection) {
FileInfo *info;
- if (disable_requests) {
+ if (private->disable_requests) {
return;
}
@@ -1047,9 +1179,9 @@ media_art_request_download (MediaArtType type,
return;
}
- info = file_info_new (local_uri, art_path);
+ info = file_info_new (process, local_uri, art_path);
- g_dbus_connection_call (connection,
+ g_dbus_connection_call (private->connection,
ALBUMARTER_SERVICE,
ALBUMARTER_PATH,
ALBUMARTER_INTERFACE,
@@ -1069,14 +1201,18 @@ media_art_request_download (MediaArtType type,
}
static void
-media_art_copy_to_local (const gchar *filename,
- const gchar *local_uri)
+media_art_copy_to_local (MediaArtProcess *process,
+ const gchar *filename,
+ const gchar *local_uri)
{
+ MediaArtProcessPrivate *private;
GSList *roots, *l;
gboolean on_removable_device = FALSE;
guint flen;
- roots = storage_get_device_roots (storage, STORAGE_REMOVABLE, FALSE);
+ private = media_art_process_get_instance_private (process);
+
+ roots = storage_get_device_roots (private->storage, STORAGE_REMOVABLE, FALSE);
flen = strlen (filename);
for (l = roots; l; l = l->next) {
@@ -1133,17 +1269,20 @@ media_art_queue_cb (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
+ MediaArtProcessPrivate *private;
GError *error = NULL;
FileInfo *fi;
GVariant *v;
fi = user_data;
+ private = media_art_process_get_instance_private (fi->process);
+
v = g_dbus_connection_call_finish ((GDBusConnection *) source_object, res, &error);
if (error) {
if (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN) {
- disable_requests = TRUE;
+ private->disable_requests = TRUE;
} else {
g_warning ("%s", error->message);
}
@@ -1154,10 +1293,11 @@ media_art_queue_cb (GObject *source_object,
g_variant_unref (v);
}
- if (storage &&
+ if (private->storage &&
fi->art_path &&
g_file_test (fi->art_path, G_FILE_TEST_EXISTS)) {
- media_art_copy_to_local (fi->art_path,
+ media_art_copy_to_local (fi->process,
+ fi->art_path,
fi->local_uri);
}
@@ -1165,83 +1305,6 @@ media_art_queue_cb (GObject *source_object,
}
/**
- * media_art_init:
- *
- * Initialize libmediaart.
- *
- * This function initializes cache hash tables, backend plugins,
- * storage modules used for removable devices and connections to D-Bus.
- *
- * Returns: %TRUE if initialisation was successful, %FALSE otherwise.
- *
- * Since: 0.2.0
- */
-gboolean
-media_art_init (void)
-{
- GError *error = NULL;
-
- g_return_val_if_fail (initialized == FALSE, FALSE);
-
- media_art_plugin_init (0);
-
- /* Cache to know if we have already handled uris */
- media_art_cache = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- (GDestroyNotify) g_free,
- NULL);
-
- /* Signal handler for new album art from the extractor */
- connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-
- if (!connection) {
- g_critical ("Could not connect to the D-Bus session bus, %s",
- error ? error->message : "no error given.");
- g_clear_error (&error);
- return FALSE;
- }
-
- storage = storage_new ();
- if (!storage) {
- g_critical ("Could not start storage module for removable media detection");
- return FALSE;
- }
-
- initialized = TRUE;
-
- return TRUE;
-}
-
-/**
- * media_art_shutdown:
- *
- * Clean up and free the resources created and mentioned in media_art_init().
- *
- * Since: 0.2.0
- */
-void
-media_art_shutdown (void)
-{
- g_return_if_fail (initialized == TRUE);
-
- if (storage) {
- g_object_unref (storage);
- }
-
- if (connection) {
- g_object_unref (connection);
- }
-
- if (media_art_cache) {
- g_hash_table_unref (media_art_cache);
- }
-
- media_art_plugin_shutdown ();
-
- initialized = FALSE;
-}
-
-/**
* media_art_error_quark:
*
* Returns: the #GQuark used to identify media art errors in
@@ -1330,6 +1393,7 @@ get_heuristic_for_parent_path (GFile *file,
/**
* media_art_process_file:
+ * @process: Media art process object
* @file: File to be processed
* @buffer: (array length=len)(allow-none): a buffer containing @file data, or %NULL
* @len: length of @buffer, or 0
@@ -1352,27 +1416,32 @@ get_heuristic_for_parent_path (GFile *file,
*
* Returns: %TRUE if @file could be processed or %FALSE if @error is set.
*
- * Since: 0.2.0
+ * Since: 0.3.0
*/
gboolean
-media_art_process_file (GFile *file,
- const guchar *buffer,
- gsize len,
- const gchar *mime,
- MediaArtType type,
- const gchar *artist,
- const gchar *title,
- GError **error)
+media_art_process_file (MediaArtProcess *process,
+ GFile *file,
+ const guchar *buffer,
+ gsize len,
+ const gchar *mime,
+ MediaArtType type,
+ const gchar *artist,
+ const gchar *title,
+ GError **error)
{
+ MediaArtProcessPrivate *private;
GFile *cache_art_file, *local_art_file;
GError *local_error = NULL;
gchar *cache_art_path, *uri;
gboolean processed, created, no_cache_or_old;
guint64 mtime, cache_mtime = 0;
+ g_return_val_if_fail (MEDIA_ART_IS_PROCESS (process), FALSE);
g_return_val_if_fail (G_IS_FILE (file), FALSE);
g_return_val_if_fail (type > MEDIA_ART_NONE && type < MEDIA_ART_TYPE_COUNT, FALSE);
+ private = media_art_process_get_instance_private (process);
+
processed = created = FALSE;
uri = g_file_get_uri (file);
@@ -1452,7 +1521,7 @@ media_art_process_file (GFile *file,
key = get_heuristic_for_parent_path (file, type, artist, title);
- if (!g_hash_table_lookup (media_art_cache, key)) {
+ if (!g_hash_table_lookup (private->media_art_cache, key)) {
gchar *local_art_uri;
local_art_uri = g_file_get_uri (local_art_file);
@@ -1463,7 +1532,8 @@ media_art_process_file (GFile *file,
* media-art to the media-art
* downloaders
*/
- media_art_request_download (type,
+ media_art_request_download (process,
+ type,
artist,
title,
local_art_uri,
@@ -1472,7 +1542,7 @@ media_art_process_file (GFile *file,
set_mtime (cache_art_path, mtime);
- g_hash_table_insert (media_art_cache,
+ g_hash_table_insert (private->media_art_cache,
key,
GINT_TO_POINTER(TRUE));
g_free (local_art_uri);
@@ -1493,7 +1563,7 @@ media_art_process_file (GFile *file,
gchar *local_art_uri;
local_art_uri = g_file_get_uri (local_art_file);
- media_art_copy_to_local (cache_art_path, local_art_uri);
+ media_art_copy_to_local (process, cache_art_path, local_art_uri);
g_free (local_art_uri);
}
}
@@ -1514,7 +1584,8 @@ media_art_process_file (GFile *file,
/**
- * media_art_process:
+ * media_art_process_uri:
+ * @process: Media art process object
* @uri: URI of the media file that contained the data
* @buffer: (array length=len): A buffer of binary data
* @len: The length of @buffer, in bytes
@@ -1522,32 +1593,36 @@ media_art_process_file (GFile *file,
* @type: The type of media that contained the image data
* @artist: (allow-none): Artist name of the media
* @title: (allow-none): Title of the media
+ * @error: Pointer to potential GLib / MediaArt error, or %NULL
*
* This function is the same as media_art_process_file(), but takes the URI as
* a string rather than a #GFile object.
*
* Returns: %TRUE if @uri could be processed or %FALSE if @error is set.
*
- * Since: 0.2.0
+ * Since: 0.3.0
*/
gboolean
-media_art_process (const gchar *uri,
- const unsigned char *buffer,
- size_t len,
- const gchar *mime,
- MediaArtType type,
- const gchar *artist,
- const gchar *title,
- GError **error)
+media_art_process_uri (MediaArtProcess *process,
+ const gchar *uri,
+ const unsigned char *buffer,
+ size_t len,
+ const gchar *mime,
+ MediaArtType type,
+ const gchar *artist,
+ const gchar *title,
+ GError **error)
{
GFile *file;
gboolean result;
+ g_return_val_if_fail (MEDIA_ART_IS_PROCESS (process), FALSE);
g_return_val_if_fail (uri != NULL, FALSE);
file = g_file_new_for_uri (uri);
- result = media_art_process_file (file,
+ result = media_art_process_file (process,
+ file,
buffer,
len,
mime,
diff --git a/libmediaart/extract.h b/libmediaart/extract.h
index da71fff..95ca6e7 100644
--- a/libmediaart/extract.h
+++ b/libmediaart/extract.h
@@ -46,14 +46,13 @@ typedef enum {
MEDIA_ART_TYPE_COUNT
} MediaArtType;
-#define TRACKER_MINER_MANAGER_ERROR tracker_miner_manager_error_quark ()
/**
* MediaArtError:
* @MEDIA_ART_ERROR_NOENT: The resource that the was passed (for example a
* file or URI) does not exist.
- * @MEDIA_ART_ERROR_NOENT: The URI or GFile provided
- * points to a file that does not exist.
+ * @MEDIA_ART_ERROR_NO_STORAGE: Storage information is unknown, we
+ * have no knowledge about removable media.
*
* Enumeration values used in errors returned by the
* #MediaArtError API.
@@ -62,15 +61,50 @@ typedef enum {
**/
typedef enum {
MEDIA_ART_ERROR_NOENT,
+ MEDIA_ART_ERROR_NO_STORAGE
} MediaArtError;
+#define MEDIA_ART_ERROR media_art_error_quark ()
-gboolean media_art_init (void);
-void media_art_shutdown (void);
+GQuark media_art_error_quark (void) G_GNUC_CONST;
-GQuark media_art_error_quark (void) G_GNUC_CONST;
-gboolean media_art_process (const gchar *uri,
+#define MEDIA_ART_TYPE_PROCESS (media_art_process_get_type())
+#define MEDIA_ART_PROCESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MEDIA_ART_TYPE_PROCESS,
MediaArtProcess))
+#define MEDIA_ART_PROCESS_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), MEDIA_ART_TYPE_PROCESS,
MediaArtProcessClass))
+#define MEDIA_ART_IS_PROCESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MEDIA_ART_TYPE_PROCESS))
+#define MEDIA_ART_IS_PROCESS_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), MEDIA_ART_TYPE_PROCESS))
+#define MEDIA_ART_PROCESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MEDIA_ART_TYPE_PROCESS,
MediaArtProcessClass))
+
+typedef struct _MediaArtProcess MediaArtProcess;
+typedef struct _MediaArtProcessClass MediaArtProcessClass;
+
+/**
+ * MediaArtProcess:
+ * @parent: parent object
+ *
+ * A class implementation for processing and extracting media art.
+ **/
+struct _MediaArtProcess {
+ GObject parent;
+};
+
+/**
+ * MediaArtProcessClass:
+ * @parent: parent object class
+ *
+ * Prototype for the class.
+ **/
+struct _MediaArtProcessClass {
+ GObjectClass parent;
+};
+
+GType media_art_process_type (void) G_GNUC_CONST;
+MediaArtProcess *
+ media_art_process_new (GError **error);
+
+gboolean media_art_process_uri (MediaArtProcess *process,
+ const gchar *uri,
const unsigned char *buffer,
size_t len,
const gchar *mime,
@@ -79,14 +113,15 @@ gboolean media_art_process (const gchar *uri,
const gchar *title,
GError **error);
-gboolean media_art_process_file (GFile *file,
- const guchar *buffer,
- gsize len,
- const gchar *mime,
- MediaArtType type,
- const gchar *artist,
- const gchar *title,
- GError **error);
+gboolean media_art_process_file (MediaArtProcess *process,
+ GFile *file,
+ const guchar *buffer,
+ gsize len,
+ const gchar *mime,
+ MediaArtType type,
+ const gchar *artist,
+ const gchar *title,
+ GError **error);
G_END_DECLS
diff --git a/tests/mediaarttest.c b/tests/mediaarttest.c
index 893c585..11cd31a 100644
--- a/tests/mediaarttest.c
+++ b/tests/mediaarttest.c
@@ -76,9 +76,17 @@ struct {
};
static void
-test_mediaart_init (void)
+test_mediaart_new (void)
{
- g_assert_true (media_art_init ());
+ MediaArtProcess *process;
+ GError *error = NULL;
+
+ /* Test: creation of object */
+ process = media_art_process_new (&error);
+ g_assert_no_error (error);
+ g_assert (process != NULL);
+
+ g_object_unref (process);
}
static void
@@ -185,6 +193,7 @@ test_mediaart_location_path (void)
static void
test_mediaart_embedded_mp3 (void)
{
+ MediaArtProcess *process;
GError *error = NULL;
GFile *file = NULL;
gchar *dir, *path;
@@ -197,7 +206,11 @@ test_mediaart_embedded_mp3 (void)
file = g_file_new_for_path (path);
g_free (path);
- retval = media_art_process_file (file,
+ process = media_art_process_new (&error);
+ g_assert_no_error (error);
+
+ retval = media_art_process_file (process,
+ file,
NULL,
0,
"audio/mp3", /* mime */
@@ -211,11 +224,14 @@ test_mediaart_embedded_mp3 (void)
g_object_unref (file);
g_free (dir);
+
+ g_object_unref (process);
}
static void
test_mediaart_png (void)
{
+ MediaArtProcess *process;
GError *error = NULL;
GFile *file = NULL;
gchar *dir, *path;
@@ -229,6 +245,9 @@ test_mediaart_png (void)
file = g_file_new_for_path (path);
g_free (dir);
+ process = media_art_process_new (&error);
+ g_assert_no_error (error);
+
/* Check data is not cached currently */
media_art_get_path ("Lanedo", /* artist / title */
NULL, /* album */
@@ -241,7 +260,8 @@ test_mediaart_png (void)
g_free (out_uri);
/* Process data */
- retval = media_art_process_file (file,
+ retval = media_art_process_file (process,
+ file,
NULL,
0,
"image/png", /* mime */
@@ -284,58 +304,74 @@ test_mediaart_png (void)
g_object_unref (file);
g_free (path);
+
+ g_object_unref (process);
}
static void
test_mediaart_process_failures (void)
{
+ MediaArtProcess *process;
GError *error = NULL;
g_test_trap_subprocess ("/mediaart/process_failures/subprocess", 0, 0
/*G_TEST_SUBPROCESS_INHERIT_STDOUT | G_TEST_SUBPROCESS_INHERIT_STDERR*/);
g_test_trap_assert_failed ();
g_test_trap_assert_stderr ("*assertion 'uri != NULL' failed*");
+ process = media_art_process_new (&error);
+ g_assert_no_error (error);
+
/* Test: invalid file */
- g_assert (!media_art_process ("file:///invalid/path.png",
- NULL,
- 0,
- "image/png", /* mime */
- MEDIA_ART_ALBUM,
- "Foo", /* album */
- "Bar", /* title */
- &error));
+ g_assert (!media_art_process_uri (process,
+ "file:///invalid/path.png",
+ NULL,
+ 0,
+ "image/png", /* mime */
+ MEDIA_ART_ALBUM,
+ "Foo", /* album */
+ "Bar", /* title */
+ &error));
g_assert_error (error, g_io_error_quark(), G_IO_ERROR_NOT_FOUND);
g_clear_error (&error);
-
/* Test: Invalid mime type */
- /* g_assert (!media_art_process ("file:///invalid/path.png", */
- /* NULL, */
- /* 0, */
- /* "image/png", /\* mime *\/ */
- /* MEDIA_ART_ALBUM, */
- /* "Foo", /\* album *\/ */
- /* "Bar", /\* title *\/ */
- /* &error)); */
+ /* g_assert (!media_art_process_uri (process, */
+ /* "file:///invalid/path.png", */
+ /* NULL, */
+ /* 0, */
+ /* "image/png", /\* mime *\/ */
+ /* MEDIA_ART_ALBUM, */
+ /* "Foo", /\* album *\/ */
+ /* "Bar", /\* title *\/ */
+ /* &error)); */
/* g_message ("code:%d, domain:%d, error:'%s'\n", error->code, error->domain, error->message); */
+
+ g_object_unref (process);
}
static void
test_mediaart_process_failures_subprocess (void)
{
+ MediaArtProcess *process;
GError *error = NULL;
- g_assert (!media_art_process (NULL,
- NULL,
- 0,
- "image/png", /* mime */
- MEDIA_ART_ALBUM,
- "Foo", /* album */
- "Bar", /* title */
- &error));
+ process = media_art_process_new (&error);
g_assert_no_error (error);
+
+ g_assert (!media_art_process_uri (process,
+ NULL,
+ NULL,
+ 0,
+ "image/png", /* mime */
+ MEDIA_ART_ALBUM,
+ "Foo", /* album */
+ "Bar", /* title */
+ &error));
+ g_assert_no_error (error);
+
+ g_object_unref (process);
}
int
@@ -345,8 +381,8 @@ main (int argc, char **argv)
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/mediaart/init",
- test_mediaart_init);
+ g_test_add_func ("/mediaart/new",
+ test_mediaart_new);
g_test_add_func ("/mediaart/stripping",
test_mediaart_stripping);
g_test_add_func ("/mediaart/stripping_failures",
@@ -370,7 +406,5 @@ main (int argc, char **argv)
success = g_test_run ();
- media_art_shutdown ();
-
return success;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
