[PATCH 09/13] core: grl-media functions from macros made inline



---
 src/data/grl-media.c |   78 ++++++++++++++++++++++++------------------------
 src/data/grl-media.h |   80 +++++++++++++++++++++++++-------------------------
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/src/data/grl-media.c b/src/data/grl-media.c
index cc5f931..424fa55 100644
--- a/src/data/grl-media.c
+++ b/src/data/grl-media.c
@@ -369,7 +369,7 @@ grl_media_unserialize (const gchar *serial)
  *
  * Set the media identifier
  */
-void
+inline void
 grl_media_set_id (GrlMedia *data, const gchar *id)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -384,7 +384,7 @@ grl_media_set_id (GrlMedia *data, const gchar *id)
  *
  * Set the media's URL
  */
-void
+inline void
 grl_media_set_url (GrlMedia *data, const gchar *url)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -399,7 +399,7 @@ grl_media_set_url (GrlMedia *data, const gchar *url)
  *
  * Set the media's author
  */
-void
+inline void
 grl_media_set_author (GrlMedia *data, const gchar *author)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -414,7 +414,7 @@ grl_media_set_author (GrlMedia *data, const gchar *author)
  *
  * Set the media's title
  */
-void
+inline void
 grl_media_set_title (GrlMedia *data, const gchar *title)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -429,7 +429,7 @@ grl_media_set_title (GrlMedia *data, const gchar *title)
  *
  * Set the media's description
  */
-void
+inline void
 grl_media_set_description (GrlMedia *data, const gchar *description)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -444,7 +444,7 @@ grl_media_set_description (GrlMedia *data, const gchar *description)
  *
  * Set the media's source
  */
-void
+inline void
 grl_media_set_source (GrlMedia *data, const gchar *source)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -459,7 +459,7 @@ grl_media_set_source (GrlMedia *data, const gchar *source)
  *
  * Set the media's thumbnail URL
  */
-void
+inline void
 grl_media_set_thumbnail (GrlMedia *data, const gchar *thumbnail)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -474,7 +474,7 @@ grl_media_set_thumbnail (GrlMedia *data, const gchar *thumbnail)
  *
  * Set the media's site
  */
-void
+inline void
 grl_media_set_site (GrlMedia *data, const gchar *site)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -489,7 +489,7 @@ grl_media_set_site (GrlMedia *data, const gchar *site)
  *
  * Set the media's duration
  */
-void
+inline void
 grl_media_set_duration (GrlMedia *data, gint duration)
 {
   grl_data_set_int (GRL_DATA (data),
@@ -504,7 +504,7 @@ grl_media_set_duration (GrlMedia *data, gint duration)
  *
  * Set the media's date (TBD)
  */
-void
+inline void
 grl_media_set_date (GrlMedia *data, const gchar *date)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -519,7 +519,7 @@ grl_media_set_date (GrlMedia *data, const gchar *date)
  *
  * Set the media's mime-type
  */
-void
+inline void
 grl_media_set_mime (GrlMedia *data, const gchar *mime)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -534,7 +534,7 @@ grl_media_set_mime (GrlMedia *data, const gchar *mime)
  *
  * Set the media play count
  */
-void
+inline void
 grl_media_set_play_count (GrlMedia *data, gint play_count)
 {
   grl_data_set_int (GRL_DATA (data),
@@ -549,7 +549,7 @@ grl_media_set_play_count (GrlMedia *data, gint play_count)
  *
  * Set the media last played date
  */
-void
+inline void
 grl_media_set_last_played (GrlMedia *data, const gchar *last_played)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -564,7 +564,7 @@ grl_media_set_last_played (GrlMedia *data, const gchar *last_played)
  *
  * Set the media last played position
  */
-void
+inline void
 grl_media_set_last_position (GrlMedia *data, gint last_position)
 {
   grl_data_set_int (GRL_DATA (data),
@@ -578,7 +578,7 @@ grl_media_set_last_position (GrlMedia *data, gint last_position)
  *
  * Set the location of a player for the media (usually a flash player)
  */
-void
+inline void
 grl_media_set_external_player (GrlMedia *data, const gchar *player)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -592,7 +592,7 @@ grl_media_set_external_player (GrlMedia *data, const gchar *player)
  *
  * Set an external location where users can play the media
  */
-void
+inline void
 grl_media_set_external_url (GrlMedia *data, const gchar *url)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -607,7 +607,7 @@ grl_media_set_external_url (GrlMedia *data, const gchar *url)
  *
  * Set the media studio
  */
-void
+inline void
 grl_media_set_studio (GrlMedia *data, const gchar *studio)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -622,7 +622,7 @@ grl_media_set_studio (GrlMedia *data, const gchar *studio)
  *
  * Set the media certificate
  */
-void
+inline void
 grl_media_set_certificate (GrlMedia *data, const gchar *certificate)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -637,7 +637,7 @@ grl_media_set_certificate (GrlMedia *data, const gchar *certificate)
  *
  * Set the media license
  */
-void
+inline void
 grl_media_set_license (GrlMedia *data, const gchar *license)
 {
   grl_data_set_string (GRL_DATA (data),
@@ -651,7 +651,7 @@ grl_media_set_license (GrlMedia *data, const gchar *license)
  *
  * Returns: (type utf8) (transfer none): the media's identifier
  */
-const gchar *
+inline const gchar *
 grl_media_get_id (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_ID);
@@ -663,7 +663,7 @@ grl_media_get_id (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's URL
  */
-const gchar *
+inline const gchar *
 grl_media_get_url (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_URL);
@@ -675,7 +675,7 @@ grl_media_get_url (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's author
  */
-const gchar *
+inline const gchar *
 grl_media_get_author (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_AUTHOR);
@@ -687,7 +687,7 @@ grl_media_get_author (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's title
  */
-const gchar *
+inline const gchar *
 grl_media_get_title (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_TITLE);
@@ -699,7 +699,7 @@ grl_media_get_title (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's description
  */
-const gchar *
+inline const gchar *
 grl_media_get_description (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_DESCRIPTION);
@@ -711,7 +711,7 @@ grl_media_get_description (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's source
  */
-const gchar *
+inline const gchar *
 grl_media_get_source (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_SOURCE);
@@ -723,7 +723,7 @@ grl_media_get_source (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's thumbnail URL
  */
-const gchar *
+inline const gchar *
 grl_media_get_thumbnail (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_THUMBNAIL);
@@ -735,7 +735,7 @@ grl_media_get_thumbnail (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's site
  */
-const gchar *
+inline const gchar *
 grl_media_get_site (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_SITE);
@@ -747,7 +747,7 @@ grl_media_get_site (GrlMedia *data)
  *
  * Returns: the media's duration
  */
-gint
+inline gint
 grl_media_get_duration (GrlMedia *data)
 {
   return grl_data_get_int (GRL_DATA (data), GRL_METADATA_KEY_DURATION);
@@ -759,7 +759,7 @@ grl_media_get_duration (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's date (TBD)
  */
-const gchar *
+inline const gchar *
 grl_media_get_date (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_DATE);
@@ -771,7 +771,7 @@ grl_media_get_date (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's mime-type
  */
-const gchar *
+inline const gchar *
 grl_media_get_mime (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_MIME);
@@ -783,7 +783,7 @@ grl_media_get_mime (GrlMedia *data)
  *
  * Returns: the media's rating
  */
-gfloat
+inline gfloat
 grl_media_get_rating (GrlMedia *data)
 {
   return grl_data_get_float (GRL_DATA (data), GRL_METADATA_KEY_RATING);
@@ -795,7 +795,7 @@ grl_media_get_rating (GrlMedia *data)
  *
  * Returns: the media's play count
  */
-gint
+inline gint
 grl_media_get_play_count (GrlMedia *data)
 {
   return grl_data_get_int (GRL_DATA (data), GRL_METADATA_KEY_PLAY_COUNT);
@@ -807,7 +807,7 @@ grl_media_get_play_count (GrlMedia *data)
  *
  * Returns: the media's last_played position (in seconds)
  */
-gint
+inline gint
 grl_media_get_last_position (GrlMedia *data)
 {
   return grl_data_get_int (GRL_DATA (data), GRL_METADATA_KEY_LAST_POSITION);
@@ -819,7 +819,7 @@ grl_media_get_last_position (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's last played time
  */
-const gchar *
+inline const gchar *
 grl_media_get_last_played (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_LAST_PLAYED);
@@ -832,7 +832,7 @@ grl_media_get_last_played (GrlMedia *data)
  * Returns: (type utf8) (transfer none): URL of an external player
  * object for this media
  */
-const gchar *
+inline const gchar *
 grl_media_get_player(GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data),
@@ -846,7 +846,7 @@ grl_media_get_player(GrlMedia *data)
  * Returns: (type utf8) (transfer none): URL of an external location
  * where the user play the media.
  */
-const gchar *
+inline const gchar *
 grl_media_get_external_url (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_EXTERNAL_URL);
@@ -858,7 +858,7 @@ grl_media_get_external_url (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the studio the media is from
  */
-const gchar *
+inline const gchar *
 grl_media_get_studio(GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_STUDIO);
@@ -870,7 +870,7 @@ grl_media_get_studio(GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the media's certificate
  */
-const gchar *
+inline const gchar *
 grl_media_get_certificate (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_CERTIFICATE);
@@ -882,7 +882,7 @@ grl_media_get_certificate (GrlMedia *data)
  *
  * Returns: (type utf8) (transfer none): the license the media is under
  */
-const gchar *
+inline const gchar *
 grl_media_get_license (GrlMedia *data)
 {
   return grl_data_get_string (GRL_DATA (data), GRL_METADATA_KEY_LICENSE);
diff --git a/src/data/grl-media.h b/src/data/grl-media.h
index 9641a33..71ce077 100644
--- a/src/data/grl-media.h
+++ b/src/data/grl-media.h
@@ -84,85 +84,85 @@ struct _GrlMedia
   GrlData parent;
 };
 
-void grl_media_set_id (GrlMedia *data, const gchar *id);
+extern void grl_media_set_id (GrlMedia *data, const gchar *id);
 
-void grl_media_set_url (GrlMedia *data, const gchar *url);
+extern void grl_media_set_url (GrlMedia *data, const gchar *url);
 
-void grl_media_set_author (GrlMedia *data, const gchar *author);
+extern void grl_media_set_author (GrlMedia *data, const gchar *author);
 
-void grl_media_set_title (GrlMedia *data, const gchar *title);
+extern void grl_media_set_title (GrlMedia *data, const gchar *title);
 
-void grl_media_set_description (GrlMedia *data, const gchar *description);
+extern void grl_media_set_description (GrlMedia *data, const gchar *description);
 
-void grl_media_set_source (GrlMedia *data, const gchar *source);
+extern void grl_media_set_source (GrlMedia *data, const gchar *source);
 
-void grl_media_set_thumbnail (GrlMedia *data, const gchar *thumbnail);
+extern void grl_media_set_thumbnail (GrlMedia *data, const gchar *thumbnail);
 
-void grl_media_set_site (GrlMedia *data, const gchar *site);
+extern void grl_media_set_site (GrlMedia *data, const gchar *site);
 
-void grl_media_set_duration (GrlMedia *data, gint duration);
+extern void grl_media_set_duration (GrlMedia *data, gint duration);
 
-void grl_media_set_date (GrlMedia *data, const gchar *date);
+extern void grl_media_set_date (GrlMedia *data, const gchar *date);
 
-void grl_media_set_mime (GrlMedia *data, const gchar *mime);
+extern void grl_media_set_mime (GrlMedia *data, const gchar *mime);
 
-void grl_media_set_play_count (GrlMedia *data, gint play_count);
+extern void grl_media_set_play_count (GrlMedia *data, gint play_count);
 
-void grl_media_set_last_played (GrlMedia *data, const gchar *last_played);
+extern void grl_media_set_last_played (GrlMedia *data, const gchar *last_played);
 
-void grl_media_set_last_position (GrlMedia *data, gint last_position);
+extern void grl_media_set_last_position (GrlMedia *data, gint last_position);
 
-void grl_media_set_external_player (GrlMedia *data, const gchar *player);
+extern void grl_media_set_external_player (GrlMedia *data, const gchar *player);
 
-void grl_media_set_external_url (GrlMedia *Data, const gchar *url);
+extern void grl_media_set_external_url (GrlMedia *Data, const gchar *url);
 
-void grl_media_set_studio (GrlMedia *data, const gchar *studio);
+extern void grl_media_set_studio (GrlMedia *data, const gchar *studio);
 
-void grl_media_set_certificate (GrlMedia *data, const gchar *certificate);
+extern void grl_media_set_certificate (GrlMedia *data, const gchar *certificate);
 
-void grl_media_set_license (GrlMedia *data, const gchar *license);
+extern void grl_media_set_license (GrlMedia *data, const gchar *license);
 
-void grl_media_set_rating (GrlMedia *media, gfloat rating, gfloat max);
+extern void grl_media_set_rating (GrlMedia *media, gfloat rating, gfloat max);
 
-const gchar *grl_media_get_id (GrlMedia *data);
+extern const gchar *grl_media_get_id (GrlMedia *data);
 
-const gchar *grl_media_get_url (GrlMedia *data);
+extern const gchar *grl_media_get_url (GrlMedia *data);
 
-const gchar *grl_media_get_author (GrlMedia *data);
+extern const gchar *grl_media_get_author (GrlMedia *data);
 
-const gchar *grl_media_get_title (GrlMedia *data);
+extern const gchar *grl_media_get_title (GrlMedia *data);
 
-const gchar *grl_media_get_description (GrlMedia *data);
+extern const gchar *grl_media_get_description (GrlMedia *data);
 
-const gchar *grl_media_get_source (GrlMedia *data);
+extern const gchar *grl_media_get_source (GrlMedia *data);
 
-const gchar *grl_media_get_thumbnail (GrlMedia *data);
+extern const gchar *grl_media_get_thumbnail (GrlMedia *data);
 
-const gchar *grl_media_get_site (GrlMedia *data);
+extern const gchar *grl_media_get_site (GrlMedia *data);
 
-gint grl_media_get_duration (GrlMedia *data);
+extern gint grl_media_get_duration (GrlMedia *data);
 
-const gchar *grl_media_get_date (GrlMedia *data);
+extern const gchar *grl_media_get_date (GrlMedia *data);
 
-const gchar *grl_media_get_mime (GrlMedia *data);
+extern const gchar *grl_media_get_mime (GrlMedia *data);
 
-gfloat grl_media_get_rating (GrlMedia *data);
+extern gfloat grl_media_get_rating (GrlMedia *data);
 
-gint grl_media_get_play_count (GrlMedia *data);
+extern gint grl_media_get_play_count (GrlMedia *data);
 
-gint grl_media_get_last_position (GrlMedia *data);
+extern gint grl_media_get_last_position (GrlMedia *data);
 
-const gchar *grl_media_get_last_played (GrlMedia *data);
+extern const gchar *grl_media_get_last_played (GrlMedia *data);
 
-const gchar *grl_media_get_player (GrlMedia *data);
+extern const gchar *grl_media_get_player (GrlMedia *data);
 
-const gchar *grl_media_get_external_url (GrlMedia *data);
+extern const gchar *grl_media_get_external_url (GrlMedia *data);
 
-const gchar *grl_media_get_studio (GrlMedia *data);
+extern const gchar *grl_media_get_studio (GrlMedia *data);
 
-const gchar *grl_media_get_certificate (GrlMedia *data);
+extern const gchar *grl_media_get_certificate (GrlMedia *data);
 
-const gchar *grl_media_get_license (GrlMedia *data);
+extern const gchar *grl_media_get_license (GrlMedia *data);
 
 GType grl_media_get_type (void) G_GNUC_CONST;
 
-- 
1.7.0.4



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]