[Xfce4-commits] <parole:master> Replace tabs with spaces, improve readability for misc/*
Sean Davis
noreply at xfce.org
Fri Oct 11 11:51:01 CEST 2013
Updating branch refs/heads/master
to 8f1e768dd3dee21d574c5f81c6dff3d99c9222ce (commit)
from d5d575ad72cd77fa82223f16fa52728024434f57 (commit)
commit 8f1e768dd3dee21d574c5f81c6dff3d99c9222ce
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Aug 24 10:30:32 2013 -0400
Replace tabs with spaces, improve readability for misc/*
src/misc/parole-debug.c | 10 +-
src/misc/parole-debug.h | 28 +-
src/misc/parole-file.c | 386 +++++++++++-----------
src/misc/parole-file.h | 46 +--
src/misc/parole-filters.c | 33 +-
src/misc/parole-filters.h | 23 +-
src/misc/parole-pl-parser.c | 400 +++++++++++------------
src/misc/parole-pl-parser.h | 16 +-
src/misc/parole-provider-player.c | 128 ++++----
src/misc/parole-provider-player.h | 97 +++---
src/misc/parole-provider-plugin.c | 34 +-
src/misc/parole-provider-plugin.h | 40 +--
src/misc/parole-stream.c | 646 ++++++++++++++++++-------------------
src/misc/parole-stream.h | 15 +-
14 files changed, 955 insertions(+), 947 deletions(-)
diff --git a/src/misc/parole-debug.c b/src/misc/parole-debug.c
index 79ca9c8..dde26a3 100644
--- a/src/misc/parole-debug.c
+++ b/src/misc/parole-debug.c
@@ -36,7 +36,7 @@
#if defined(DEBUG) && defined(G_HAVE_ISO_VARARGS)
void parole_debug_enum (const gchar *func, const gchar *file, gint line,
- const gchar *text, gint v_enum, GType type)
+ const gchar *text, gint v_enum, GType type)
{
gchar *content = NULL;
GValue __value__ = { 0, };
@@ -49,12 +49,12 @@ void parole_debug_enum (const gchar *func, const gchar *file, gint line,
fprintf(stdout, "TRACE[%s:%d] %s(): %s : %s", file, line , func, text, content);
fprintf(stdout, "\n");
- g_value_unset (&__value__);
+ g_value_unset (&__value__);
g_free (content);
}
void parole_debug_enum_full (const gchar *func, const gchar *file, gint line,
- gint v_enum, GType type, const gchar *format, ...)
+ gint v_enum, GType type, const gchar *format, ...)
{
va_list args;
gchar *buffer;
@@ -70,12 +70,12 @@ void parole_debug_enum_full (const gchar *func, const gchar *file, gint line,
va_start (args, format);
g_vasprintf (&buffer, format, args);
va_end (args);
-
+
fprintf(stdout, "TRACE[%s:%d] %s(): ", file, line, func);
fprintf(stdout, "%s: %s", buffer, content);
fprintf(stdout, "\n");
- g_value_unset (&__value__);
+ g_value_unset (&__value__);
g_free (content);
g_free (buffer);
}
diff --git a/src/misc/parole-debug.h b/src/misc/parole-debug.h
index 54eeb1e..36503d2 100644
--- a/src/misc/parole-debug.h
+++ b/src/misc/parole-debug.h
@@ -40,20 +40,20 @@ G_BEGIN_DECLS
#define PAROLE_DEBUG_ENUM_FULL(_value, _type, ...)\
parole_debug_enum_full (__func__, __FILE__, __LINE__, _value, _type, __VA_ARGS__)
-void parole_debug_enum (const gchar *func,
- const gchar *file,
- gint line,
- const gchar *text,
- gint v_enum,
- GType type);
-
-void parole_debug_enum_full (const gchar *func,
- const gchar *file,
- gint line,
- gint v_enum,
- GType type,
- const gchar *format,
- ...) G_GNUC_PRINTF (6, 7);
+void parole_debug_enum (const gchar *func,
+ const gchar *file,
+ gint line,
+ const gchar *text,
+ gint v_enum,
+ GType type);
+
+void parole_debug_enum_full (const gchar *func,
+ const gchar *file,
+ gint line,
+ gint v_enum,
+ GType type,
+ const gchar *format,
+ ...) G_GNUC_PRINTF (6, 7);
#else
diff --git a/src/misc/parole-file.c b/src/misc/parole-file.c
index ceac529..f816416 100644
--- a/src/misc/parole-file.c
+++ b/src/misc/parole-file.c
@@ -44,13 +44,13 @@ typedef struct _ParoleFilePrivate ParoleFilePrivate;
struct _ParoleFilePrivate
{
- gchar *filename;
- gchar *display_name;
- gchar *uri;
+ gchar *filename;
+ gchar *display_name;
+ gchar *uri;
gchar *content_type;
- gchar *directory;
- gchar *custom_subtitles;
- gint dvd_chapter;
+ gchar *directory;
+ gchar *custom_subtitles;
+ gint dvd_chapter;
};
@@ -61,9 +61,9 @@ enum
PROP_DISPLAY_NAME,
PROP_URI,
PROP_CONTENT_TYPE,
- PROP_DIRECTORY,
- PROP_CUSTOM_SUBTITLES,
- PROP_DVD_CHAPTER
+ PROP_DIRECTORY,
+ PROP_CUSTOM_SUBTITLES,
+ PROP_DVD_CHAPTER
};
G_DEFINE_TYPE (ParoleFile, parole_file, G_TYPE_OBJECT)
@@ -78,59 +78,59 @@ parole_file_finalize (GObject *object)
priv = PAROLE_FILE_GET_PRIVATE (file);
if ( priv->filename )
- g_free (priv->filename);
+ g_free (priv->filename);
if ( priv->uri )
- g_free (priv->uri);
-
+ g_free (priv->uri);
+
if ( priv->display_name )
- g_free (priv->display_name);
-
+ g_free (priv->display_name);
+
if ( priv->content_type )
- g_free (priv->content_type);
-
- if ( priv->directory )
- g_free (priv->directory);
-
- if ( priv->custom_subtitles )
- g_free (priv->custom_subtitles);
+ g_free (priv->content_type);
+
+ if ( priv->directory )
+ g_free (priv->directory);
+
+ if ( priv->custom_subtitles )
+ g_free (priv->custom_subtitles);
G_OBJECT_CLASS (parole_file_parent_class)->finalize (object);
}
static void
parole_file_set_property (GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
+ const GValue *value, GParamSpec *pspec)
{
ParoleFile *file;
file = PAROLE_FILE (object);
switch (prop_id)
{
- case PROP_PATH:
- PAROLE_FILE_GET_PRIVATE (file)->filename = g_value_dup_string (value);
- break;
- case PROP_DISPLAY_NAME:
- PAROLE_FILE_GET_PRIVATE (file)->display_name = g_value_dup_string (value);
- break;
- case PROP_DIRECTORY:
- PAROLE_FILE_GET_PRIVATE (file)->directory = g_value_dup_string (value);
- break;
- case PROP_CUSTOM_SUBTITLES:
- PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles = g_value_dup_string (value);
- break;
- case PROP_DVD_CHAPTER:
- PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter = g_value_get_int (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_PATH:
+ PAROLE_FILE_GET_PRIVATE (file)->filename = g_value_dup_string (value);
+ break;
+ case PROP_DISPLAY_NAME:
+ PAROLE_FILE_GET_PRIVATE (file)->display_name = g_value_dup_string (value);
+ break;
+ case PROP_DIRECTORY:
+ PAROLE_FILE_GET_PRIVATE (file)->directory = g_value_dup_string (value);
+ break;
+ case PROP_CUSTOM_SUBTITLES:
+ PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles = g_value_dup_string (value);
+ break;
+ case PROP_DVD_CHAPTER:
+ PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter = g_value_get_int (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
static void
parole_file_get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
+ GValue *value, GParamSpec *pspec)
{
ParoleFile *file;
@@ -138,30 +138,30 @@ parole_file_get_property (GObject *object, guint prop_id,
switch (prop_id)
{
- case PROP_PATH:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->filename);
- break;
- case PROP_URI:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->filename);
- break;
- case PROP_CONTENT_TYPE:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->content_type);
- break;
- case PROP_DISPLAY_NAME:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->display_name);
- break;
- case PROP_DIRECTORY:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->directory);
- break;
- case PROP_CUSTOM_SUBTITLES:
- g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles);
- break;
- case PROP_DVD_CHAPTER:
- g_value_set_int (value, PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_PATH:
+ g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->filename);
+ break;
+ case PROP_URI:
+ g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->filename);
+ break;
+ case PROP_CONTENT_TYPE:
+ g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->content_type);
+ break;
+ case PROP_DISPLAY_NAME:
+ g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->display_name);
+ break;
+ case PROP_DIRECTORY:
+ g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->directory);
+ break;
+ case PROP_CUSTOM_SUBTITLES:
+ g_value_set_string (value, PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles);
+ break;
+ case PROP_DVD_CHAPTER:
+ g_value_set_int (value, PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -204,65 +204,65 @@ parole_file_constructed (GObject *object)
gfile = g_file_new_for_commandline_arg (priv->filename);
info = g_file_query_info (gfile,
- "standard::*,",
- 0,
- NULL,
- &error);
-
-
- priv->directory = g_file_get_path (g_file_get_parent( gfile ));
+ "standard::*,",
+ 0,
+ NULL,
+ &error);
+
+
+ priv->directory = g_file_get_path (g_file_get_parent( gfile ));
if ( error )
{
- if ( G_LIKELY (error->code == G_IO_ERROR_NOT_SUPPORTED) )
- {
- g_error_free (error);
- if ( !priv->display_name )
- priv->display_name = g_file_get_basename (gfile);
- }
- else
- {
- if ( !priv->display_name )
- priv->display_name = g_strdup (priv->filename);
- g_warning ("Unable to read file info %s", error->message);
- }
- goto out;
+ if ( G_LIKELY (error->code == G_IO_ERROR_NOT_SUPPORTED) )
+ {
+ g_error_free (error);
+ if ( !priv->display_name )
+ priv->display_name = g_file_get_basename (gfile);
+ }
+ else
+ {
+ if ( !priv->display_name )
+ priv->display_name = g_strdup (priv->filename);
+ g_warning ("Unable to read file info %s", error->message);
+ }
+ goto out;
}
#ifdef HAVE_TAGLIBC
else
{
- TagLib_File *tag_file;
- TagLib_Tag *tag;
- gchar *title;
- gchar *title_s;
-
- tag_file = taglib_file_new (priv->filename);
-
- if ( tag_file )
- {
- tag = taglib_file_tag (tag_file);
- if ( tag )
- {
- title = taglib_tag_title (tag);
-
- if ( title )
- {
- title_s = g_strstrip (title);
- if ( strlen (title_s ) )
- {
- priv->display_name = g_strdup (title_s);
- }
- }
-
- taglib_tag_free_strings ();
- }
- taglib_file_free (tag_file);
- }
+ TagLib_File *tag_file;
+ TagLib_Tag *tag;
+ gchar *title;
+ gchar *title_s;
+
+ tag_file = taglib_file_new (priv->filename);
+
+ if ( tag_file )
+ {
+ tag = taglib_file_tag (tag_file);
+ if ( tag )
+ {
+ title = taglib_tag_title (tag);
+
+ if ( title )
+ {
+ title_s = g_strstrip (title);
+ if ( strlen (title_s ) )
+ {
+ priv->display_name = g_strdup (title_s);
+ }
+ }
+
+ taglib_tag_free_strings ();
+ }
+ taglib_file_free (tag_file);
+ }
}
#endif
if (!priv->display_name)
- priv->display_name = g_strdup (g_file_info_get_display_name (info));
+ priv->display_name = g_strdup (g_file_info_get_display_name (info));
priv->content_type = g_strdup (g_file_info_get_content_type (info));
@@ -292,13 +292,13 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_PATH,
- g_param_spec_string ("filename",
- "File name",
- "The file name",
- NULL,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
+ PROP_PATH,
+ g_param_spec_string ("filename",
+ "File name",
+ "The file name",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
/**
* ParoleFile:display-name:
@@ -308,13 +308,13 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_DISPLAY_NAME,
- g_param_spec_string ("display-name",
- "Display name",
- "A UTF-8 name that can be displayed in the UI",
- NULL,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
+ PROP_DISPLAY_NAME,
+ g_param_spec_string ("display-name",
+ "Display name",
+ "A UTF-8 name that can be displayed in the UI",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
/**
* ParoleFile:uri:
@@ -324,12 +324,12 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_URI,
- g_param_spec_string ("uri",
- "Uri",
- "The uri of the file",
- NULL,
- G_PARAM_READABLE));
+ PROP_URI,
+ g_param_spec_string ("uri",
+ "Uri",
+ "The uri of the file",
+ NULL,
+ G_PARAM_READABLE));
/**
* ParoleFile:content-type:
@@ -339,14 +339,14 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_CONTENT_TYPE,
- g_param_spec_string ("content-type",
- "Content type",
- "The content type of the file",
- NULL,
- G_PARAM_READABLE));
-
- /**
+ PROP_CONTENT_TYPE,
+ g_param_spec_string ("content-type",
+ "Content type",
+ "The content type of the file",
+ NULL,
+ G_PARAM_READABLE));
+
+ /**
* ParoleFile:directory:
*
* The parent directory of the file.
@@ -354,14 +354,14 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_DIRECTORY,
- g_param_spec_string ("directory",
- "Parent directory",
- "The parent directory of the file",
- NULL,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
-
+ PROP_DIRECTORY,
+ g_param_spec_string ("directory",
+ "Parent directory",
+ "The parent directory of the file",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
+
/**
* ParoleFile:custom_subtitles:
*
@@ -370,14 +370,14 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.4
**/
g_object_class_install_property (object_class,
- PROP_CUSTOM_SUBTITLES,
- g_param_spec_string ("custom_subtitles",
- "Custom Subtitles",
- "The custom subtitles set by the user",
- NULL,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
-
+ PROP_CUSTOM_SUBTITLES,
+ g_param_spec_string ("custom_subtitles",
+ "Custom Subtitles",
+ "The custom subtitles set by the user",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
+
/**
* ParoleFile:dvd_chapter:
*
@@ -386,15 +386,15 @@ parole_file_class_init (ParoleFileClass *klass)
* Since: 0.4
**/
g_object_class_install_property (object_class,
- PROP_DVD_CHAPTER,
- g_param_spec_int ("dvd-chapter",
- "DVD Chapter",
- "DVD Chapter, used for seeking a DVD using the playlist.",
- -1,
- 1000,
- -1,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
+ PROP_DVD_CHAPTER,
+ g_param_spec_int ("dvd-chapter",
+ "DVD Chapter",
+ "DVD Chapter, used for seeking a DVD using the playlist.",
+ -1,
+ 1000,
+ -1,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParoleFilePrivate));
}
@@ -410,9 +410,9 @@ parole_file_init (ParoleFile *file)
priv->display_name = NULL;
priv->uri = NULL;
priv->content_type = NULL;
- priv->directory = NULL;
- priv->custom_subtitles = NULL;
- priv->dvd_chapter = 0;
+ priv->directory = NULL;
+ priv->custom_subtitles = NULL;
+ priv->dvd_chapter = 0;
}
/**
@@ -449,9 +449,9 @@ parole_file_new_with_display_name (const gchar *filename, const gchar *display_n
ParoleFile *file = NULL;
file = g_object_new (PAROLE_TYPE_FILE,
- "filename", filename,
- "display-name", display_name,
- NULL);
+ "filename", filename,
+ "display-name", display_name,
+ NULL);
return file;
}
@@ -473,9 +473,9 @@ parole_file_new_cdda_track (const gint track_num, const gchar *display_name)
gchar *uri = g_strdup_printf("cdda://%i", track_num);
file = g_object_new (PAROLE_TYPE_FILE,
- "filename", uri,
- "display-name", display_name,
- NULL);
+ "filename", uri,
+ "display-name", display_name,
+ NULL);
g_free(uri);
return file;
@@ -498,10 +498,10 @@ parole_file_new_dvd_chapter (gint chapter_num, const gchar *display_name)
gchar *uri = "dvd:/";
file = g_object_new (PAROLE_TYPE_FILE,
- "filename", uri,
- "display-name", display_name,
- "dvd-chapter", chapter_num,
- NULL);
+ "filename", uri,
+ "display-name", display_name,
+ "dvd-chapter", chapter_num,
+ NULL);
//g_free(uri); FIXME This should probably be freed.
return file;
@@ -617,12 +617,12 @@ parole_file_set_custom_subtitles (const ParoleFile *file, gchar *suburi)
g_value_set_static_string (&value, suburi);
parole_file_set_property (G_OBJECT(file), PROP_CUSTOM_SUBTITLES,
- &value, g_param_spec_string ("custom_subtitles",
- "Custom Subtitles",
- "The custom subtitles set by the user",
- NULL,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
+ &value, g_param_spec_string ("custom_subtitles",
+ "Custom Subtitles",
+ "The custom subtitles set by the user",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
}
/**
@@ -650,13 +650,13 @@ parole_file_set_dvd_chapter (const ParoleFile *file, gint dvd_chapter)
g_value_set_int (&value, dvd_chapter);
parole_file_set_property (G_OBJECT(file), PROP_DVD_CHAPTER,
- &value, g_param_spec_int ("dvd-chapter",
- "DVD Chapter",
- "DVD Chapter, used for seeking a DVD using the playlist.",
- -1,
- 1000,
- -1,
- G_PARAM_CONSTRUCT_ONLY|
- G_PARAM_READWRITE));
+ &value, g_param_spec_int ("dvd-chapter",
+ "DVD Chapter",
+ "DVD Chapter, used for seeking a DVD using the playlist.",
+ -1,
+ 1000,
+ -1,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
}
diff --git a/src/misc/parole-file.h b/src/misc/parole-file.h
index 8347834..4f70bed 100644
--- a/src/misc/parole-file.h
+++ b/src/misc/parole-file.h
@@ -40,43 +40,51 @@ typedef struct _ParoleFileClass ParoleFileClass;
struct _ParoleFile
{
- GObject parent;
+ GObject parent;
};
struct _ParoleFileClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
};
-GType parole_file_get_type (void) G_GNUC_CONST;
+GType parole_file_get_type (void) G_GNUC_CONST;
-ParoleFile *parole_file_new (const gchar *filename);
+ParoleFile *parole_file_new (const gchar *filename);
-ParoleFile *parole_file_new_with_display_name (const gchar *filename,
- const gchar *display_name);
-
-ParoleFile *parole_file_new_cdda_track (const gint track_num, const gchar *display_name);
+ParoleFile *parole_file_new_with_display_name (const gchar *filename,
+ const gchar *display_name);
+
+ParoleFile *parole_file_new_cdda_track (const gint track_num,
+ const gchar *display_name);
-ParoleFile *parole_file_new_dvd_chapter (gint chapter_num, const gchar *display_name);
-
+ParoleFile *parole_file_new_dvd_chapter (gint chapter_num,
+ const gchar *display_name);
+
+void parole_file_set_custom_subtitles (const ParoleFile *file, gchar *suburi);
-void parole_file_set_custom_subtitles (const ParoleFile *file, gchar *suburi);
+void parole_file_set_dvd_chapter (const ParoleFile *file, gint dvd_chapter);
-void parole_file_set_dvd_chapter (const ParoleFile *file, gint dvd_chapter);
+gint parole_file_get_dvd_chapter (const ParoleFile *file);
-const gchar G_CONST_RETURN *parole_file_get_directory (const ParoleFile *file) G_GNUC_PURE;
+const gchar
+G_CONST_RETURN *parole_file_get_directory (const ParoleFile *file) G_GNUC_PURE;
-const gchar G_CONST_RETURN *parole_file_get_file_name (const ParoleFile *file) G_GNUC_PURE;
+const gchar
+G_CONST_RETURN *parole_file_get_file_name (const ParoleFile *file) G_GNUC_PURE;
-const gchar G_CONST_RETURN *parole_file_get_display_name (const ParoleFile *file) G_GNUC_PURE;
+const gchar
+G_CONST_RETURN *parole_file_get_display_name (const ParoleFile *file) G_GNUC_PURE;
-const gchar G_CONST_RETURN *parole_file_get_uri (const ParoleFile *file) G_GNUC_PURE;
+const gchar
+G_CONST_RETURN *parole_file_get_uri (const ParoleFile *file) G_GNUC_PURE;
-const gchar G_CONST_RETURN *parole_file_get_content_type (const ParoleFile *file) G_GNUC_PURE;
+const gchar
+G_CONST_RETURN *parole_file_get_content_type (const ParoleFile *file) G_GNUC_PURE;
-const gchar G_CONST_RETURN *parole_file_get_custom_subtitles (const ParoleFile *file) G_GNUC_PURE;
+const gchar
+G_CONST_RETURN *parole_file_get_custom_subtitles (const ParoleFile *file) G_GNUC_PURE;
-gint parole_file_get_dvd_chapter (const ParoleFile *file);
G_END_DECLS
diff --git a/src/misc/parole-filters.c b/src/misc/parole-filters.c
index 5585c27..8352827 100644
--- a/src/misc/parole-filters.c
+++ b/src/misc/parole-filters.c
@@ -36,7 +36,6 @@
#include "data/mime/parole-mime-types.h"
static char *playlist_mime_types[] = {
- //"text/plain",
"audio/x-mpegurl",
"audio/playlist",
"audio/x-scpls",
@@ -56,7 +55,7 @@ static char *playlist_mime_types[] = {
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_audio_filter (void)
+GtkFileFilter *parole_get_supported_audio_filter (void)
{
GtkFileFilter *filter;
guint i;
@@ -66,7 +65,7 @@ GtkFileFilter *parole_get_supported_audio_filter (void)
gtk_file_filter_set_name (filter, _("Audio"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
+ gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
return filter;
}
@@ -82,7 +81,7 @@ GtkFileFilter *parole_get_supported_audio_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_video_filter (void)
+GtkFileFilter *parole_get_supported_video_filter (void)
{
GtkFileFilter *filter;
guint i;
@@ -92,7 +91,7 @@ GtkFileFilter *parole_get_supported_video_filter (void)
gtk_file_filter_set_name (filter, _("Video"));
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
+ gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
return filter;
}
@@ -107,7 +106,7 @@ GtkFileFilter *parole_get_supported_video_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_media_filter (void)
+GtkFileFilter *parole_get_supported_media_filter (void)
{
GtkFileFilter *filter;
guint i;
@@ -117,15 +116,15 @@ GtkFileFilter *parole_get_supported_media_filter (void)
gtk_file_filter_set_name (filter, _("Audio and video"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
-
+ gtk_file_filter_add_mime_type (filter, audio_mime_types[i]);
+
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
+ gtk_file_filter_add_mime_type (filter, video_mime_types[i]);
return filter;
}
-GtkRecentFilter *parole_get_supported_recent_media_filter (void)
+GtkRecentFilter *parole_get_supported_recent_media_filter (void)
{
GtkRecentFilter *filter;
guint i;
@@ -135,10 +134,10 @@ GtkRecentFilter *parole_get_supported_recent_media_filter (void)
gtk_recent_filter_set_name (filter, _("Audio and video"));
for ( i = 0; i < G_N_ELEMENTS (audio_mime_types); i++)
- gtk_recent_filter_add_mime_type (filter, audio_mime_types[i]);
-
+ gtk_recent_filter_add_mime_type (filter, audio_mime_types[i]);
+
for ( i = 0; i < G_N_ELEMENTS (video_mime_types); i++)
- gtk_recent_filter_add_mime_type (filter, video_mime_types[i]);
+ gtk_recent_filter_add_mime_type (filter, video_mime_types[i]);
return filter;
}
@@ -164,7 +163,7 @@ GtkFileFilter *parole_get_supported_files_filter (void)
gtk_file_filter_set_name (filter, _("All supported files"));
for ( i = 0; i < G_N_ELEMENTS (playlist_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, playlist_mime_types[i]);
+ gtk_file_filter_add_mime_type (filter, playlist_mime_types[i]);
return filter;
@@ -180,7 +179,7 @@ GtkRecentFilter *parole_get_supported_recent_files_filter (void)
gtk_recent_filter_set_name (filter, _("All supported files"));
for ( i = 0; i < G_N_ELEMENTS (playlist_mime_types); i++)
- gtk_recent_filter_add_mime_type (filter, playlist_mime_types[i]);
+ gtk_recent_filter_add_mime_type (filter, playlist_mime_types[i]);
return filter;
@@ -197,7 +196,7 @@ GtkRecentFilter *parole_get_supported_recent_files_filter (void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_playlist_filter (void)
+GtkFileFilter *parole_get_supported_playlist_filter (void)
{
GtkFileFilter *filter;
guint i;
@@ -207,7 +206,7 @@ GtkFileFilter *parole_get_supported_playlist_filter (void)
gtk_file_filter_set_name (filter, _("Playlist files"));
for ( i = 0; i < G_N_ELEMENTS (playlist_mime_types); i++)
- gtk_file_filter_add_mime_type (filter, playlist_mime_types[i]);
+ gtk_file_filter_add_mime_type (filter, playlist_mime_types[i]);
return filter;
}
diff --git a/src/misc/parole-filters.h b/src/misc/parole-filters.h
index 305e592..2820c68 100644
--- a/src/misc/parole-filters.h
+++ b/src/misc/parole-filters.h
@@ -33,22 +33,17 @@
G_BEGIN_DECLS
-GtkFileFilter *parole_get_supported_audio_filter (void);
+GtkFileFilter *parole_get_supported_audio_filter (void);
+GtkFileFilter *parole_get_supported_video_filter (void);
+GtkFileFilter *parole_get_supported_media_filter (void);
+GtkFileFilter *parole_get_supported_files_filter (void);
+GtkFileFilter *parole_get_supported_playlist_filter (void);
-GtkFileFilter *parole_get_supported_video_filter (void);
+GtkRecentFilter *parole_get_supported_recent_media_filter (void);
+GtkRecentFilter *parole_get_supported_recent_files_filter (void);
-GtkFileFilter *parole_get_supported_media_filter (void);
-
-GtkRecentFilter *parole_get_supported_recent_media_filter (void);
-
-GtkFileFilter *parole_get_supported_files_filter (void);
-
-GtkRecentFilter *parole_get_supported_recent_files_filter (void);
-
-GtkFileFilter *parole_get_supported_playlist_filter (void);
-
-gboolean parole_file_filter (GtkFileFilter *filter,
- ParoleFile *file);
+gboolean parole_file_filter (GtkFileFilter *filter,
+ ParoleFile *file);
G_END_DECLS
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 9f9e98a..618cfd1 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -23,10 +23,10 @@
/*
* Based on code from:
*
- * Totem pl parser: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Bastien Nocera
- * Copyright (C) 2003, 2004 Colin Walters <walters at rhythmbox.org>
+ * Totem pl parser: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Bastien Nocera
+ * Copyright (C) 2003, 2004 Colin Walters <walters at rhythmbox.org>
*
- * xfmedia: Copyright (c) 2004-2005 Brian Tarricone, <bjt23 at cornell.edu>
+ * xfmedia: Copyright (c) 2004-2005 Brian Tarricone, <bjt23 at cornell.edu>
*
* Thanks :).
*/
@@ -76,21 +76,21 @@ parole_filename_to_utf8(const gchar* filename)
static void
parole_xspf_xml_start (GMarkupParseContext *context, const gchar *element_name,
- const gchar **attribute_names, const gchar **attribute_values,
- gpointer user_data, GError **error)
+ const gchar **attribute_names, const gchar **attribute_values,
+ gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
if ( !data->started )
{
- if (!g_ascii_strcasecmp (element_name, "playlist") )
- data->started = TRUE;
+ if (!g_ascii_strcasecmp (element_name, "playlist") )
+ data->started = TRUE;
}
}
static void
parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize text_len,
- gpointer user_data, GError **error)
+ gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
const gchar *element_name;
@@ -103,22 +103,22 @@ parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize tex
if (!g_ascii_strcasecmp (element_name, "location") )
{
if (data->uri)
- {
+ {
g_free (data->uri);
data->uri = NULL;
}
-
+
if (text_len > 0)
data->uri = g_strdup (text);
}
else if (!g_ascii_strcasecmp (element_name, "title") )
{
if (data->title)
- {
+ {
g_free (data->title);
data->title = NULL;
}
-
+
if (text_len > 0)
data->title = g_strdup (text);
}
@@ -126,64 +126,64 @@ parole_xspf_xml_text (GMarkupParseContext *context, const gchar *text, gsize tex
static void
parole_xspf_xml_end (GMarkupParseContext *context, const gchar *element_name,
- gpointer user_data, GError **error)
+ gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
ParoleFile *file;
if (! g_ascii_strcasecmp (element_name, "playlist"))
data->started = FALSE;
-
+
if (!data->started)
return;
-
+
if (!g_ascii_strcasecmp (element_name, "track"))
{
if (data->uri)
- {
- file = parole_file_new_with_display_name (data->uri, data->title);
- data->list = g_slist_append (data->list, file);
-
- g_free (data->uri);
- data->uri = NULL;
- }
-
- if ( data->title)
- {
- g_free (data->title);
- data->title = NULL;
- }
+ {
+ file = parole_file_new_with_display_name (data->uri, data->title);
+ data->list = g_slist_append (data->list, file);
+
+ g_free (data->uri);
+ data->uri = NULL;
+ }
+
+ if ( data->title)
+ {
+ g_free (data->title);
+ data->title = NULL;
+ }
}
}
static void
parole_asx_xml_start (GMarkupParseContext *context, const gchar *element_name,
- const gchar **attribute_names, const gchar **attribute_values,
- gpointer user_data, GError **error)
+ const gchar **attribute_names, const gchar **attribute_values,
+ gpointer user_data, GError **error)
{
guint i;
ParoleParserData *data = user_data;
if ( !data->started )
{
- if (!g_ascii_strcasecmp (element_name, "asx") )
- data->started = TRUE;
- else
- return;
+ if (!g_ascii_strcasecmp (element_name, "asx") )
+ data->started = TRUE;
+ else
+ return;
}
if (!g_ascii_strcasecmp (element_name, "ref") )
{
if (data->uri)
- {
+ {
g_free (data->uri);
data->uri = NULL;
}
-
+
for ( i = 0; attribute_names[i]; i++)
- {
+ {
if ( !g_ascii_strcasecmp (attribute_names[i], "href"))
- {
+ {
data->uri = g_strdup (attribute_values[i]);
break;
}
@@ -193,7 +193,7 @@ parole_asx_xml_start (GMarkupParseContext *context, const gchar *element_name,
static void
parole_asx_xml_text (GMarkupParseContext *context, const gchar *text, gsize text_len,
- gpointer user_data, GError **error)
+ gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
const gchar *element_name;
@@ -206,11 +206,11 @@ parole_asx_xml_text (GMarkupParseContext *context, const gchar *text, gsize text
if (!g_ascii_strcasecmp (element_name, "title") )
{
if (data->title)
- {
+ {
g_free (data->title);
data->title = NULL;
}
-
+
if (text_len > 0)
data->title = g_strdup (text);
}
@@ -218,33 +218,33 @@ parole_asx_xml_text (GMarkupParseContext *context, const gchar *text, gsize text
static void
parole_asx_xml_end (GMarkupParseContext *context, const gchar *element_name,
- gpointer user_data, GError **error)
+ gpointer user_data, GError **error)
{
ParoleParserData *data = user_data;
ParoleFile *file;
if (!g_ascii_strcasecmp (element_name, "ASX"))
data->started = FALSE;
-
+
if (!data->started)
return;
-
+
if (!g_ascii_strcasecmp (element_name, "entry"))
{
if (data->uri)
- {
- file = parole_file_new_with_display_name (data->uri, data->title);
- data->list = g_slist_append (data->list, file);
-
- g_free (data->uri);
- data->uri = NULL;
- }
-
- if ( data->title)
- {
- g_free (data->title);
- data->title = NULL;
- }
+ {
+ file = parole_file_new_with_display_name (data->uri, data->title);
+ data->list = g_slist_append (data->list, file);
+
+ g_free (data->uri);
+ data->uri = NULL;
+ }
+
+ if ( data->title)
+ {
+ g_free (data->title);
+ data->title = NULL;
+ }
}
}
@@ -271,33 +271,33 @@ parole_pl_parser_parse_asx (const gchar *filename)
file = g_file_new_for_path (filename);
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
- goto out;
+ goto out;
if ( g_utf8_validate (contents, -1, NULL) == FALSE)
{
- gchar *fixed;
- fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
- if (fixed != NULL)
- {
- g_free (contents);
- contents = fixed;
- }
+ gchar *fixed;
+ fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+ if (fixed != NULL)
+ {
+ g_free (contents);
+ contents = fixed;
+ }
}
pctx = g_markup_parse_context_new (&parser, 0, &data, NULL);
if ( !g_markup_parse_context_parse (pctx, contents, size, &error) )
{
- if ( error )
- {
- g_critical ("Unable to parse asx file : %s : %s\n", filename, error->message);
- g_error_free (error);
- }
+ if ( error )
+ {
+ g_critical ("Unable to parse asx file : %s : %s\n", filename, error->message);
+ g_error_free (error);
+ }
}
else
{
- if ( !g_markup_parse_context_end_parse (pctx, &error) )
- {
+ if ( !g_markup_parse_context_end_parse (pctx, &error) )
+ {
g_critical ("Unable to finish parsing ASX playlist file %s", error->message);
g_error_free (error);
}
@@ -337,26 +337,26 @@ parole_pl_parser_parse_m3u (const gchar *filename)
path = g_path_get_dirname(filename);
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
- goto out;
+ goto out;
if ( g_utf8_validate (contents, -1, NULL) == FALSE)
{
- gchar *fixed;
- fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
- if (fixed != NULL)
- {
- g_free (contents);
- contents = fixed;
- }
+ gchar *fixed;
+ fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+ if (fixed != NULL)
+ {
+ g_free (contents);
+ contents = fixed;
+ }
}
if ( strstr (contents,"\x0d") == NULL)
{
- split_char = "\n";
+ split_char = "\n";
}
else
{
- split_char = "\x0d\n";
+ split_char = "\x0d\n";
}
lines = g_strsplit (contents, split_char, 0);
@@ -367,18 +367,18 @@ parole_pl_parser_parse_m3u (const gchar *filename)
for ( i = 0; lines[i] != NULL; i++)
{
- if ( lines[i][0] == '\0' || lines[i][0] == '#')
- continue;
-
+ if ( lines[i][0] == '\0' || lines[i][0] == '#')
+ continue;
+
if ( lines[i][0] == '/' ) {
pl_filename = g_strdup(lines[i]);
}
else {
- pl_filename = g_strjoin("", path, lines[i], NULL);
+ pl_filename = g_strjoin("", path, lines[i], NULL);
}
-
- list = g_slist_append (list, parole_file_new (pl_filename));
+
+ list = g_slist_append (list, parole_file_new (pl_filename));
}
if (pl_filename)
@@ -409,21 +409,21 @@ parole_pl_parser_parse_pls (const gchar *filename)
nentries = xfce_rc_read_int_entry (rcfile, "NumberOfEntries", 0);
for (i = 1; i <= nentries; i++)
- {
+ {
g_snprintf (key, 128, "File%d", i);
-
+
file_entry = xfce_rc_read_entry (rcfile, key, NULL);
-
+
if (!file_entry)
continue;
-
- g_snprintf (key, 128, "Title%d", i);
-
+
+ g_snprintf (key, 128, "Title%d", i);
+
title_entry = xfce_rc_read_entry (rcfile, key, NULL);
-
- file = parole_file_new_with_display_name (file_entry, title_entry);
- list = g_slist_append (list, file);
- }
+
+ file = parole_file_new_with_display_name (file_entry, title_entry);
+ list = g_slist_append (list, file);
+ }
}
xfce_rc_close (rcfile);
@@ -454,33 +454,33 @@ parole_pl_parser_parse_xspf (const gchar *filename)
file = g_file_new_for_path (filename);
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
- goto out;
+ goto out;
if ( g_utf8_validate (contents, -1, NULL) == FALSE)
{
- gchar *fixed;
- fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
- if (fixed != NULL)
- {
- g_free (contents);
- contents = fixed;
- }
+ gchar *fixed;
+ fixed = g_convert (contents, -1, "UTF-8", "ISO8859-1", NULL, NULL, NULL);
+ if (fixed != NULL)
+ {
+ g_free (contents);
+ contents = fixed;
+ }
}
pctx = g_markup_parse_context_new (&parser, 0, &data, NULL);
if ( !g_markup_parse_context_parse (pctx, contents, size, &error) )
{
- if ( error )
- {
- g_critical ("Unable to parse xspf file : %s : %s\n", filename, error->message);
- g_error_free (error);
- }
+ if ( error )
+ {
+ g_critical ("Unable to parse xspf file : %s : %s\n", filename, error->message);
+ g_error_free (error);
+ }
}
else
{
- if ( !g_markup_parse_context_end_parse (pctx, &error) )
- {
+ if ( !g_markup_parse_context_end_parse (pctx, &error) )
+ {
g_critical ("Unable to finish parsing xspf playlist file %s", error->message);
g_error_free (error);
}
@@ -500,20 +500,20 @@ parole_pl_parser_parse (ParolePlFormat format, const gchar *filename)
switch (format)
{
- case PAROLE_PL_FORMAT_M3U:
- list = parole_pl_parser_parse_m3u (filename);
- break;
- case PAROLE_PL_FORMAT_PLS:
- list = parole_pl_parser_parse_pls (filename);
- break;
- case PAROLE_PL_FORMAT_ASX:
- list = parole_pl_parser_parse_asx (filename);
- break;
- case PAROLE_PL_FORMAT_XSPF:
- list = parole_pl_parser_parse_xspf (filename);
- break;
- default:
- break;
+ case PAROLE_PL_FORMAT_M3U:
+ list = parole_pl_parser_parse_m3u (filename);
+ break;
+ case PAROLE_PL_FORMAT_PLS:
+ list = parole_pl_parser_parse_pls (filename);
+ break;
+ case PAROLE_PL_FORMAT_ASX:
+ list = parole_pl_parser_parse_asx (filename);
+ break;
+ case PAROLE_PL_FORMAT_XSPF:
+ list = parole_pl_parser_parse_xspf (filename);
+ break;
+ default:
+ break;
}
return list;
@@ -534,16 +534,16 @@ parole_pl_parser_save_m3u (FILE *f, GSList *files)
for ( i = 0; i < len; i++)
{
- ParoleFile *file;
- file = g_slist_nth_data (files, i);
- display_name = g_strdup(parole_file_get_display_name (file));
- file_name = parole_filename_to_utf8(parole_file_get_file_name (file));
-
- if (display_name && file_name)
- {
- fprintf (f, "#EXTINF:-1,%s\n", display_name);
- fprintf (f, "%s\n\n", file_name);
- }
+ ParoleFile *file;
+ file = g_slist_nth_data (files, i);
+ display_name = g_strdup(parole_file_get_display_name (file));
+ file_name = parole_filename_to_utf8(parole_file_get_file_name (file));
+
+ if (display_name && file_name)
+ {
+ fprintf (f, "#EXTINF:-1,%s\n", display_name);
+ fprintf (f, "%s\n\n", file_name);
+ }
}
if (display_name)
@@ -568,12 +568,12 @@ parole_pl_parser_save_pls (FILE *f, GSList *files)
for ( i = 1; i <= len; i++)
{
- ParoleFile *file;
- file = g_slist_nth_data (files, i - 1);
- g_snprintf (key, 128, "File%d", i);
- fprintf (f, "%s=%s\n", key, parole_filename_to_utf8(parole_file_get_file_name (file)));
- g_snprintf (key, 128, "Title%d", i);
- fprintf (f, "%s=%s\n\n", key, parole_file_get_display_name (file));
+ ParoleFile *file;
+ file = g_slist_nth_data (files, i - 1);
+ g_snprintf (key, 128, "File%d", i);
+ fprintf (f, "%s=%s\n", key, parole_filename_to_utf8(parole_file_get_file_name (file)));
+ g_snprintf (key, 128, "Title%d", i);
+ fprintf (f, "%s=%s\n\n", key, parole_file_get_display_name (file));
}
return TRUE;
@@ -591,11 +591,11 @@ parole_pl_parser_save_asx (FILE *f, GSList *files)
for ( i = 0; i < len; i++)
{
- ParoleFile *file;
- file = g_slist_nth_data (files, i);
- fprintf (f, " <ENTRY>\n <TITLE>%s</TITLE>\n <REF HREF=\"%s\"/>\n </ENTRY>\n",
- parole_file_get_display_name (file),
- parole_file_get_uri (file));
+ ParoleFile *file;
+ file = g_slist_nth_data (files, i);
+ fprintf (f, " <ENTRY>\n <TITLE>%s</TITLE>\n <REF HREF=\"%s\"/>\n </ENTRY>\n",
+ parole_file_get_display_name (file),
+ parole_file_get_uri (file));
}
fputs ("</ASX>\n", f);
@@ -612,17 +612,17 @@ parole_pl_parser_save_xspf (FILE *f, GSList *files)
len = g_slist_length (files);
fputs ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
- "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n", f);
-
+ "<playlist version=\"1\" xmlns=\"http://xspf.org/ns/0/\">\n", f);
+
fputs (" <trackList>\n", f);
for ( i = 0; i < len; i++)
{
- ParoleFile *file;
-
- file = g_slist_nth_data (files, i);
- fprintf (f, " <track>\n <title>%s</title>\n <location>%s</location>\n </track>\n",
- parole_file_get_display_name (file), parole_file_get_uri (file));
+ ParoleFile *file;
+
+ file = g_slist_nth_data (files, i);
+ fprintf (f, " <track>\n <title>%s</title>\n <location>%s</location>\n </track>\n",
+ parole_file_get_display_name (file), parole_file_get_uri (file));
}
fputs (" </trackList>\n<playlist>", f);
@@ -645,20 +645,20 @@ ParolePlFormat
parole_pl_parser_guess_format_from_extension (const gchar *filename)
{
if ( g_str_has_suffix (filename, ".m3u") || g_str_has_suffix (filename, ".M3U") )
- return PAROLE_PL_FORMAT_M3U;
-
+ return PAROLE_PL_FORMAT_M3U;
+
if ( g_str_has_suffix (filename, ".pls") || g_str_has_suffix (filename, ".PLS") )
- return PAROLE_PL_FORMAT_PLS;
-
+ return PAROLE_PL_FORMAT_PLS;
+
if ( g_str_has_suffix (filename, ".xspf") || g_str_has_suffix (filename, ".XSPF") )
- return PAROLE_PL_FORMAT_XSPF;
-
+ return PAROLE_PL_FORMAT_XSPF;
+
if ( g_str_has_suffix (filename, ".asx") || g_str_has_suffix (filename, ".ASX") )
- return PAROLE_PL_FORMAT_ASX;
-
+ return PAROLE_PL_FORMAT_ASX;
+
if ( g_str_has_suffix (filename, ".wax") || g_str_has_suffix (filename, ".WAX") )
- return PAROLE_PL_FORMAT_XSPF;
-
+ return PAROLE_PL_FORMAT_XSPF;
+
return PAROLE_PL_FORMAT_UNKNOWN;
}
@@ -686,19 +686,19 @@ parole_pl_parser_guess_format_from_data (const gchar *filename)
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL ) )
{
- g_debug ("Unable to load content of file=%s", filename);
- goto out;
+ g_debug ("Unable to load content of file=%s", filename);
+ goto out;
}
if ( strstr (contents, "<ASX VERSION") )
- format = PAROLE_PL_FORMAT_ASX;
+ format = PAROLE_PL_FORMAT_ASX;
else if ( strstr (contents, "<trackList>") || strstr (contents, "<tracklist>") )
- format = PAROLE_PL_FORMAT_XSPF;
+ format = PAROLE_PL_FORMAT_XSPF;
else if ( strstr (contents, "NumberOfEntries") )
- format = PAROLE_PL_FORMAT_PLS;
+ format = PAROLE_PL_FORMAT_PLS;
else
- /* try to load the file as M3U*/
- format = PAROLE_PL_FORMAT_M3U;
+ /* try to load the file as M3U*/
+ format = PAROLE_PL_FORMAT_M3U;
g_free (contents);
out:
@@ -730,20 +730,20 @@ gboolean parole_pl_parser_save_from_files (GSList *files, const gchar *filename,
switch (format)
{
- case PAROLE_PL_FORMAT_M3U:
- ret_val = parole_pl_parser_save_m3u (f, files);
- break;
- case PAROLE_PL_FORMAT_PLS:
- ret_val = parole_pl_parser_save_pls (f, files);
- break;
- case PAROLE_PL_FORMAT_ASX:
- ret_val = parole_pl_parser_save_asx (f, files);
- break;
- case PAROLE_PL_FORMAT_XSPF:
- ret_val = parole_pl_parser_save_xspf (f, files);
- break;
- default:
- break;
+ case PAROLE_PL_FORMAT_M3U:
+ ret_val = parole_pl_parser_save_m3u (f, files);
+ break;
+ case PAROLE_PL_FORMAT_PLS:
+ ret_val = parole_pl_parser_save_pls (f, files);
+ break;
+ case PAROLE_PL_FORMAT_ASX:
+ ret_val = parole_pl_parser_save_asx (f, files);
+ break;
+ case PAROLE_PL_FORMAT_XSPF:
+ ret_val = parole_pl_parser_save_xspf (f, files);
+ break;
+ default:
+ break;
}
fclose (f);
@@ -767,15 +767,15 @@ GSList *parole_pl_parser_parse_from_file_by_extension (const gchar *filename)
GSList *list = NULL;
if ( (format = parole_pl_parser_guess_format_from_extension (filename)) == PAROLE_PL_FORMAT_UNKNOWN &&
- (format = parole_pl_parser_guess_format_from_data (filename)) == PAROLE_PL_FORMAT_UNKNOWN )
+ (format = parole_pl_parser_guess_format_from_data (filename)) == PAROLE_PL_FORMAT_UNKNOWN )
{
- g_debug ("Unable to guess playlist format : %s", filename);
- goto out;
+ g_debug ("Unable to guess playlist format : %s", filename);
+ goto out;
}
PAROLE_DEBUG_ENUM_FULL (format, PAROLE_ENUM_TYPE_PL_FORMAT, "playlist %s ", filename);
list = parole_pl_parser_parse (format, filename);
-
+
out:
return list;
}
@@ -825,16 +825,16 @@ gboolean parole_pl_parser_can_parse_data (const guchar *data, gint len)
if ( mime_type && result_uncertain == FALSE )
{
- GtkFileFilter *filter = g_object_ref_sink (parole_get_supported_playlist_filter ());
- GtkFileFilterInfo filter_info;
- g_debug ("Mime_type=%s", mime_type);
- filter_info.mime_type = mime_type;
-
- filter_info.contains = GTK_FILE_FILTER_MIME_TYPE;
-
- result = gtk_file_filter_filter (filter, &filter_info);
- g_object_unref (filter);
- g_free (mime_type);
+ GtkFileFilter *filter = g_object_ref_sink (parole_get_supported_playlist_filter ());
+ GtkFileFilterInfo filter_info;
+ g_debug ("Mime_type=%s", mime_type);
+ filter_info.mime_type = mime_type;
+
+ filter_info.contains = GTK_FILE_FILTER_MIME_TYPE;
+
+ result = gtk_file_filter_filter (filter, &filter_info);
+ g_object_unref (filter);
+ g_free (mime_type);
}
return result;
diff --git a/src/misc/parole-pl-parser.h b/src/misc/parole-pl-parser.h
index bdd69f3..3ea18c2 100644
--- a/src/misc/parole-pl-parser.h
+++ b/src/misc/parole-pl-parser.h
@@ -41,19 +41,19 @@ typedef enum
} ParolePlFormat;
-ParolePlFormat parole_pl_parser_guess_format_from_extension (const gchar *filename);
+ParolePlFormat parole_pl_parser_guess_format_from_extension (const gchar *filename);
-ParolePlFormat parole_pl_parser_guess_format_from_data (const gchar *filename);
+ParolePlFormat parole_pl_parser_guess_format_from_data (const gchar *filename);
-gboolean parole_pl_parser_can_parse_data (const guchar *data, gint len);
+gboolean parole_pl_parser_can_parse_data (const guchar *data, gint len);
-GSList *parole_pl_parser_parse_from_file_by_extension (const gchar *filename);
+GSList *parole_pl_parser_parse_from_file_by_extension (const gchar *filename);
-GSList *parole_pl_parser_parse_all_from_file (const gchar *filename);
+GSList *parole_pl_parser_parse_all_from_file (const gchar *filename);
-gboolean parole_pl_parser_save_from_files (GSList *files,
- const gchar *filename,
- ParolePlFormat format);
+gboolean parole_pl_parser_save_from_files (GSList *files,
+ const gchar *filename,
+ ParolePlFormat format);
G_END_DECLS
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index e9913ce..8bd9cac 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -28,8 +28,8 @@
#include "parole-marshal.h"
#include "parole-enum-types.h"
-static void parole_provider_player_base_init (gpointer klass);
-static void parole_provider_player_class_init (gpointer klass);
+static void parole_provider_player_base_init (gpointer klass);
+static void parole_provider_player_class_init (gpointer klass);
GType
parole_provider_player_get_type (void)
@@ -38,23 +38,23 @@ parole_provider_player_get_type (void)
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- static const GTypeInfo info =
- {
- sizeof (ParoleProviderPlayerIface),
- (GBaseInitFunc) parole_provider_player_base_init,
- NULL,
- (GClassInitFunc) parole_provider_player_class_init,
- NULL,
- NULL,
- 0,
- 0,
- NULL,
- NULL,
- };
+ static const GTypeInfo info =
+ {
+ sizeof (ParoleProviderPlayerIface),
+ (GBaseInitFunc) parole_provider_player_base_init,
+ NULL,
+ (GClassInitFunc) parole_provider_player_class_init,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ };
- type = g_type_register_static (G_TYPE_INTERFACE, "ParoleProviderPlayerIface", &info, 0);
+ type = g_type_register_static (G_TYPE_INTERFACE, "ParoleProviderPlayerIface", &info, 0);
- g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+ g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
}
return type;
@@ -66,43 +66,43 @@ static void parole_provider_player_base_init (gpointer klass)
if (G_UNLIKELY (!initialized))
{
- /**
- * ParoleProviderPlayerIface::state-changed:
- * @player: the object which received the signal.
- * @stream: a #ParoleStream.
- * @state: the new state.
- *
- * Issued when the Parole state changed.
- *
- * Since: 0.2
- **/
- g_signal_new ("state-changed",
- G_TYPE_FROM_INTERFACE (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleProviderPlayerIface, state_changed),
- NULL, NULL,
- parole_marshal_VOID__OBJECT_ENUM,
- G_TYPE_NONE, 2,
- PAROLE_TYPE_STREAM, PAROLE_ENUM_TYPE_STATE);
+ /**
+ * ParoleProviderPlayerIface::state-changed:
+ * @player: the object which received the signal.
+ * @stream: a #ParoleStream.
+ * @state: the new state.
+ *
+ * Issued when the Parole state changed.
+ *
+ * Since: 0.2
+ **/
+ g_signal_new ("state-changed",
+ G_TYPE_FROM_INTERFACE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ParoleProviderPlayerIface, state_changed),
+ NULL, NULL,
+ parole_marshal_VOID__OBJECT_ENUM,
+ G_TYPE_NONE, 2,
+ PAROLE_TYPE_STREAM, PAROLE_ENUM_TYPE_STATE);
- /**
- * ParoleProviderPlayerIface::tag-message:
- * @player: the object which received the signal.
- * @stream: a #ParoleStream.
- *
- * Indicated that the stream tags were found and ready to be read.
- *
- * Since: 0.2
- **/
- g_signal_new ("tag-message",
- G_TYPE_FROM_INTERFACE (klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ParoleProviderPlayerIface, tag_message),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, PAROLE_TYPE_STREAM);
-
- initialized = TRUE;
+ /**
+ * ParoleProviderPlayerIface::tag-message:
+ * @player: the object which received the signal.
+ * @stream: a #ParoleStream.
+ *
+ * Indicated that the stream tags were found and ready to be read.
+ *
+ * Since: 0.2
+ **/
+ g_signal_new ("tag-message",
+ G_TYPE_FROM_INTERFACE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (ParoleProviderPlayerIface, tag_message),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, PAROLE_TYPE_STREAM);
+
+ initialized = TRUE;
}
}
@@ -128,7 +128,7 @@ GtkWidget *parole_provider_player_get_main_window (ParoleProviderPlayer *player)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_main_window )
{
- window = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_main_window) (player);
+ window = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_main_window) (player);
}
return window;
}
@@ -150,7 +150,7 @@ GtkWidget *parole_provider_player_get_main_window (ParoleProviderPlayer *player)
* Since: 0.2
**/
void parole_provider_player_pack (ParoleProviderPlayer *player, GtkWidget *widget,
- const gchar *title, ParolePluginContainer container)
+ const gchar *title, ParolePluginContainer container)
{
g_return_if_fail (PAROLE_IS_PROVIDER_PLAYER (player));
@@ -159,7 +159,7 @@ void parole_provider_player_pack (ParoleProviderPlayer *player, GtkWidget *widge
(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pack) (player, widget, title, container);
}
}
-
+
/**
* parole_provider_player_get_state:
* @player: a #ParoleProviderPlayer
@@ -179,7 +179,7 @@ ParoleState parole_provider_player_get_state (ParoleProviderPlayer *player)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_state )
{
- state = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_state) (player);
+ state = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_state) (player);
}
return state;
@@ -201,7 +201,7 @@ const ParoleStream *parole_provider_player_get_stream (ParoleProviderPlayer *p
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
{
- return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream) (player);
+ return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream) (player);
}
return NULL;
@@ -230,7 +230,7 @@ gboolean parole_provider_player_play_uri (ParoleProviderPlayer *player, const gc
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_uri )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_uri) (player, uri);
+ ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_uri) (player, uri);
}
return ret;
}
@@ -259,7 +259,7 @@ gboolean parole_provider_player_pause (ParoleProviderPlayer *player)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pause )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pause) (player);
+ ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pause) (player);
}
return ret;
@@ -290,7 +290,7 @@ gboolean parole_provider_player_resume (ParoleProviderPlayer *player)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->resume )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->resume) (player);
+ ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->resume) (player);
}
return ret;
@@ -318,7 +318,7 @@ gboolean parole_provider_player_stop (ParoleProviderPlayer *player)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->stop )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->stop) (player);
+ ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->stop) (player);
}
return ret;
@@ -346,7 +346,7 @@ gboolean parole_provider_player_seek (ParoleProviderPlayer *player, gdouble pos)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->seek )
{
- ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->seek) (player, pos);
+ ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->seek) (player, pos);
}
return ret;
@@ -367,6 +367,6 @@ void parole_provider_player_open_media_chooser (ParoleProviderPlayer *player)
if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->open_media_chooser )
{
- (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->open_media_chooser) (player);
+ (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->open_media_chooser) (player);
}
}
diff --git a/src/misc/parole-provider-player.h b/src/misc/parole-provider-player.h
index ec24830..060a6a9 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -32,13 +32,13 @@
G_BEGIN_DECLS
-#define PAROLE_TYPE_PROVIDER_PLAYER (parole_provider_player_get_type ())
-#define PAROLE_PROVIDER_PLAYER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_PROVIDER_PLAYER, ParoleProviderPlayer))
-#define PAROLE_IS_PROVIDER_PLAYER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_PROVIDER_PLAYER))
-#define PAROLE_PROVIDER_PLAYER_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), PAROLE_TYPE_PROVIDER_PLAYER, ParoleProviderPlayerIface))
+#define PAROLE_TYPE_PROVIDER_PLAYER (parole_provider_player_get_type ())
+#define PAROLE_PROVIDER_PLAYER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_PROVIDER_PLAYER, ParoleProviderPlayer))
+#define PAROLE_IS_PROVIDER_PLAYER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_PROVIDER_PLAYER))
+#define PAROLE_PROVIDER_PLAYER_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), PAROLE_TYPE_PROVIDER_PLAYER, ParoleProviderPlayerIface))
typedef struct _ParoleProviderPlayerIface ParoleProviderPlayerIface;
-typedef struct _ParoleProviderPlayer ParoleProviderPlayer;
+typedef struct _ParoleProviderPlayer ParoleProviderPlayer;
typedef enum
{
@@ -53,67 +53,70 @@ struct _ParoleProviderPlayerIface
GTypeInterface __parent__;
/*< private >*/
- GtkWidget *(*get_main_window) (ParoleProviderPlayer *player);
+ GtkWidget *(*get_main_window) (ParoleProviderPlayer *player);
- void (*pack) (ParoleProviderPlayer *player,
- GtkWidget *widget,
- const gchar *title,
- ParolePluginContainer container);
-
- ParoleState (*get_state) (ParoleProviderPlayer *player);
+ void (*pack) (ParoleProviderPlayer *player,
+ GtkWidget *widget,
+ const gchar *title,
+ ParolePluginContainer container);
+
+ ParoleState (*get_state) (ParoleProviderPlayer *player);
- const ParoleStream *(*get_stream) (ParoleProviderPlayer *player);
+ const ParoleStream *(*get_stream) (ParoleProviderPlayer *player);
- gboolean (*play_uri) (ParoleProviderPlayer *player,
- const gchar *uri);
-
- gboolean (*pause) (ParoleProviderPlayer *player);
+ gboolean (*play_uri) (ParoleProviderPlayer *player,
+ const gchar *uri);
+
+ gboolean (*pause) (ParoleProviderPlayer *player);
- gboolean (*resume) (ParoleProviderPlayer *player);
+ gboolean (*resume) (ParoleProviderPlayer *player);
- gboolean (*stop) (ParoleProviderPlayer *player);
+ gboolean (*stop) (ParoleProviderPlayer *player);
- gboolean (*seek) (ParoleProviderPlayer *player,
- gdouble pos);
-
- void (*open_media_chooser) (ParoleProviderPlayer *player);
-
+ gboolean (*seek) (ParoleProviderPlayer *player,
+ gdouble pos);
+
+ void (*open_media_chooser) (ParoleProviderPlayer *player);
+
/*< signals >*/
- void (*tag_message) (ParoleProviderPlayer *player,
- const ParoleStream *stream);
-
- void (*state_changed) (ParoleProviderPlayer *player,
- const ParoleStream *stream,
- ParoleState state);
+ void (*tag_message) (ParoleProviderPlayer *player,
+ const ParoleStream *stream);
+
+ void (*state_changed) (ParoleProviderPlayer *player,
+ const ParoleStream *stream,
+ ParoleState state);
};
-GType parole_provider_player_get_type (void) G_GNUC_CONST;
+GType parole_provider_player_get_type (void) G_GNUC_CONST;
-GtkWidget *parole_provider_player_get_main_window (ParoleProviderPlayer *player);
+GtkWidget
+*parole_provider_player_get_main_window (ParoleProviderPlayer *player);
-void parole_provider_player_pack (ParoleProviderPlayer *player,
- GtkWidget *widget,
- const gchar *title,
- ParolePluginContainer container);
-
-ParoleState parole_provider_player_get_state (ParoleProviderPlayer *player);
+void parole_provider_player_pack (ParoleProviderPlayer *player,
+ GtkWidget *widget,
+ const gchar *title,
+ ParolePluginContainer container);
+
+ParoleState parole_provider_player_get_state (ParoleProviderPlayer *player);
-const ParoleStream *parole_provider_player_get_stream (ParoleProviderPlayer *player);
+const ParoleStream
+*parole_provider_player_get_stream (ParoleProviderPlayer *player);
-gboolean parole_provider_player_play_uri (ParoleProviderPlayer *player,
- const gchar *uri);
+gboolean parole_provider_player_play_uri (ParoleProviderPlayer *player,
+ const gchar *uri);
-gboolean parole_provider_player_pause (ParoleProviderPlayer *player);
+gboolean parole_provider_player_pause (ParoleProviderPlayer *player);
-gboolean parole_provider_player_resume (ParoleProviderPlayer *player);
+gboolean parole_provider_player_resume (ParoleProviderPlayer *player);
-gboolean parole_provider_player_stop (ParoleProviderPlayer *player);
+gboolean parole_provider_player_stop (ParoleProviderPlayer *player);
-gboolean parole_provider_player_seek (ParoleProviderPlayer *player,
- gdouble pos);
+gboolean parole_provider_player_seek (ParoleProviderPlayer *player,
+ gdouble pos);
-void parole_provider_player_open_media_chooser (ParoleProviderPlayer *player);
+void
+parole_provider_player_open_media_chooser (ParoleProviderPlayer *player);
G_END_DECLS
diff --git a/src/misc/parole-provider-plugin.c b/src/misc/parole-provider-plugin.c
index cc303ed..cea6cea 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -33,21 +33,21 @@ parole_provider_plugin_get_type (void)
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- static const GTypeInfo info =
- {
- sizeof (ParoleProviderPluginIface),
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- 0,
- 0,
- NULL,
- NULL,
- };
+ static const GTypeInfo info =
+ {
+ sizeof (ParoleProviderPluginIface),
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ NULL,
+ NULL,
+ };
- type = g_type_register_static (G_TYPE_INTERFACE, "ParoleProviderPlugin", &info, 0);
+ type = g_type_register_static (G_TYPE_INTERFACE, "ParoleProviderPlugin", &info, 0);
}
return type;
@@ -72,7 +72,7 @@ gboolean parole_provider_plugin_get_is_configurable (ParoleProviderPlugin *provi
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable )
{
- configurable = (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable) (provider);
+ configurable = (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable) (provider);
}
return configurable;
@@ -94,7 +94,7 @@ void parole_provider_plugin_configure (ParoleProviderPlugin *provider, GtkWidget
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->configure )
{
- (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->configure) (provider, parent);
+ (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->configure) (provider, parent);
}
}
@@ -114,6 +114,6 @@ void parole_provider_plugin_set_player (ParoleProviderPlugin *provider, ParolePr
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player )
{
- (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player) (provider, player);
+ (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player) (provider, player);
}
}
diff --git a/src/misc/parole-provider-plugin.h b/src/misc/parole-provider-plugin.h
index 9d99063..d6c1b04 100644
--- a/src/misc/parole-provider-plugin.h
+++ b/src/misc/parole-provider-plugin.h
@@ -33,37 +33,39 @@
G_BEGIN_DECLS
-#define PAROLE_TYPE_PROVIDER_PLUGIN (parole_provider_plugin_get_type ())
-#define PAROLE_PROVIDER_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_PROVIDER_PLUGIN, ParoleProviderPlugin))
-#define PAROLE_IS_PROVIDER_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_PROVIDER_PLUGIN))
-#define PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), PAROLE_TYPE_PROVIDER_PLUGIN, ParoleProviderPluginIface))
+#define PAROLE_TYPE_PROVIDER_PLUGIN (parole_provider_plugin_get_type ())
+#define PAROLE_PROVIDER_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_PROVIDER_PLUGIN, ParoleProviderPlugin))
+#define PAROLE_IS_PROVIDER_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_PROVIDER_PLUGIN))
+#define PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE((o), PAROLE_TYPE_PROVIDER_PLUGIN, ParoleProviderPluginIface))
typedef struct _ParoleProviderPluginIface ParoleProviderPluginIface;
-typedef struct _ParoleProviderPlugin ParoleProviderPlugin;
+typedef struct _ParoleProviderPlugin ParoleProviderPlugin;
struct _ParoleProviderPluginIface
{
- GTypeInterface __parent__;
+ GTypeInterface __parent__;
/*< public >*/
- gboolean (*get_is_configurable) (ParoleProviderPlugin *provider);
+ gboolean (*get_is_configurable) (ParoleProviderPlugin *provider);
- void (*configure) (ParoleProviderPlugin *provider,
- GtkWidget *parent);
-
- void (*set_player) (ParoleProviderPlugin *provider,
- ParoleProviderPlayer *player);
+ void (*configure) (ParoleProviderPlugin *provider,
+ GtkWidget *parent);
+
+ void (*set_player) (ParoleProviderPlugin *provider,
+ ParoleProviderPlayer *player);
};
-GType parole_provider_plugin_get_type (void) G_GNUC_CONST;
+GType parole_provider_plugin_get_type (void) G_GNUC_CONST;
-gboolean parole_provider_plugin_get_is_configurable (ParoleProviderPlugin *provider);
+gboolean
+parole_provider_plugin_get_is_configurable (ParoleProviderPlugin *provider);
-void parole_provider_plugin_configure (ParoleProviderPlugin *provider,
- GtkWidget *parent);
-
-void parole_provider_plugin_set_player (ParoleProviderPlugin *provider,
- ParoleProviderPlayer *player);
+void parole_provider_plugin_configure (ParoleProviderPlugin *provider,
+ GtkWidget *parent);
+
+void parole_provider_plugin_set_player (ParoleProviderPlugin *provider,
+ ParoleProviderPlayer *player);
+
G_END_DECLS
#endif /* __PAROLE_PLUGIN_IFACE_H__ */
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 5a1aa9a..dc403f9 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -36,14 +36,14 @@
#define PAROLE_STREAM_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_STREAM, ParoleStreamPrivate))
-#define PAROLE_STREAM_FREE_STR_PROP(str) \
- if ( str ) \
- g_free (str); \
- str = NULL; \
+#define PAROLE_STREAM_FREE_STR_PROP(str) \
+ if ( str ) \
+ g_free (str); \
+ str = NULL; \
#define PAROLE_STREAM_DUP_GVALUE_STRING(str, value) \
- PAROLE_STREAM_FREE_STR_PROP (str); \
- str = g_value_dup_string (value); \
+ PAROLE_STREAM_FREE_STR_PROP (str); \
+ str = g_value_dup_string (value); \
typedef struct _ParoleStreamPrivate ParoleStreamPrivate;
@@ -52,19 +52,19 @@ struct _ParoleStreamPrivate
/*Properties*/
gchar *uri;
gchar *subtitles;
- gboolean has_audio;
+ gboolean has_audio;
gboolean has_video;
- gboolean live;
- gboolean seekable;
- gboolean tag_available;
+ gboolean live;
+ gboolean seekable;
+ gboolean tag_available;
gint video_w;
gint video_h;
- gint64 absolute_duration;
- gint duration;
- guint tracks;
+ gint64 absolute_duration;
+ gint duration;
+ guint tracks;
guint track;
- guint disp_par_n;
- guint disp_par_d;
+ guint disp_par_n;
+ guint disp_par_d;
gchar *title;
gchar *artist;
gchar *year;
@@ -111,19 +111,19 @@ parole_stream_get_media_type_from_uri (ParoleStream *stream, const gchar *uri)
ParoleMediaType type = PAROLE_MEDIA_TYPE_UNKNOWN;
if ( g_str_has_prefix (uri, "file:/") )
- type = PAROLE_MEDIA_TYPE_LOCAL_FILE;
+ type = PAROLE_MEDIA_TYPE_LOCAL_FILE;
else if ( g_str_has_prefix (uri, "dvd:/") )
- type = PAROLE_MEDIA_TYPE_DVD;
+ type = PAROLE_MEDIA_TYPE_DVD;
else if ( g_str_has_prefix (uri, "vcd:") )
- type = PAROLE_MEDIA_TYPE_VCD;
+ type = PAROLE_MEDIA_TYPE_VCD;
else if ( g_str_has_prefix (uri, "svcd:/") )
- type = PAROLE_MEDIA_TYPE_SVCD;
+ type = PAROLE_MEDIA_TYPE_SVCD;
else if ( g_str_has_prefix (uri, "cdda:/") )
- type = PAROLE_MEDIA_TYPE_CDDA;
+ type = PAROLE_MEDIA_TYPE_CDDA;
else if ( g_str_has_prefix (uri, "dvb:/") )
- type = PAROLE_MEDIA_TYPE_DVB;
+ type = PAROLE_MEDIA_TYPE_DVB;
else
- type = PAROLE_MEDIA_TYPE_UNKNOWN;
+ type = PAROLE_MEDIA_TYPE_UNKNOWN;
g_value_init (&val, PAROLE_ENUM_TYPE_MEDIA_TYPE);
g_value_set_enum (&val, type);
@@ -132,173 +132,173 @@ parole_stream_get_media_type_from_uri (ParoleStream *stream, const gchar *uri)
}
static void parole_stream_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
ParoleStream *stream;
stream = PAROLE_STREAM (object);
switch (prop_id)
{
- case PROP_URI:
- {
- ParoleStreamPrivate *priv;
- priv = PAROLE_STREAM_GET_PRIVATE (stream);
- priv->uri = g_value_dup_string (value);
- parole_stream_get_media_type_from_uri (stream, priv->uri);
- break;
- }
- case PROP_SUBTITLES:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->subtitles, value);
- break;
- case PROP_LIVE:
- {
- ParoleStreamPrivate *priv;
- gboolean maybe_remote;
-
- priv = PAROLE_STREAM_GET_PRIVATE (stream);
- maybe_remote = priv->media_type == PAROLE_MEDIA_TYPE_REMOTE ||
- priv->media_type == PAROLE_MEDIA_TYPE_UNKNOWN;
- priv->live = g_value_get_boolean (value) && maybe_remote;
- break;
- }
- case PROP_MEDIA_TYPE:
- PAROLE_STREAM_GET_PRIVATE (stream)->media_type = g_value_get_enum (value);
- break;
- case PROP_HAS_AUDIO:
- PAROLE_STREAM_GET_PRIVATE (stream)->has_audio = g_value_get_boolean (value);
- break;
- case PROP_HAS_VIDEO:
- PAROLE_STREAM_GET_PRIVATE (stream)->has_video = g_value_get_boolean (value);
- break;
- case PROP_SEEKABLE:
- PAROLE_STREAM_GET_PRIVATE (stream)->seekable = g_value_get_boolean (value);
- break;
- case PROP_DISP_PAR_D:
- PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_d = g_value_get_uint (value);
- break;
- case PROP_DISP_PAR_N:
- PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_n = g_value_get_uint (value);
- break;
- case PROP_TRACKS:
- PAROLE_STREAM_GET_PRIVATE (stream)->tracks = g_value_get_uint (value);
- break;
- case PROP_TRACK:
- PAROLE_STREAM_GET_PRIVATE (stream)->track = g_value_get_uint (value);
- break;
- case PROP_TAG_AVAILABLE:
- PAROLE_STREAM_GET_PRIVATE (stream)->tag_available = g_value_get_boolean (value);
- break;
- case PROP_DURATION:
- PAROLE_STREAM_GET_PRIVATE (stream)->duration = g_value_get_int64 (value);
- break;
- case PROP_ABSOLUTE_DURATION:
- PAROLE_STREAM_GET_PRIVATE (stream)->absolute_duration = g_value_get_int64 (value);
- break;
- case PROP_VIDEO_HEIGHT:
- PAROLE_STREAM_GET_PRIVATE (stream)->video_h = g_value_get_int (value);
- break;
- case PROP_VIDEO_WIDTH:
- PAROLE_STREAM_GET_PRIVATE (stream)->video_w = g_value_get_int (value);
- break;
- case PROP_TITLE:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->title, value);
- break;
- case PROP_ARTIST:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->artist, value);
- break;
- case PROP_YEAR:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->year, value);
- break;
- case PROP_ALBUM:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->album, value);
- break;
- case PROP_COMMENT:
- PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->comment, value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_URI:
+ {
+ ParoleStreamPrivate *priv;
+ priv = PAROLE_STREAM_GET_PRIVATE (stream);
+ priv->uri = g_value_dup_string (value);
+ parole_stream_get_media_type_from_uri (stream, priv->uri);
+ break;
+ }
+ case PROP_SUBTITLES:
+ PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->subtitles, value);
+ break;
+ case PROP_LIVE:
+ {
+ ParoleStreamPrivate *priv;
+ gboolean maybe_remote;
+
+ priv = PAROLE_STREAM_GET_PRIVATE (stream);
+ maybe_remote = priv->media_type == PAROLE_MEDIA_TYPE_REMOTE ||
+ priv->media_type == PAROLE_MEDIA_TYPE_UNKNOWN;
+ priv->live = g_value_get_boolean (value) && maybe_remote;
+ break;
+ }
+ case PROP_MEDIA_TYPE:
+ PAROLE_STREAM_GET_PRIVATE (stream)->media_type = g_value_get_enum (value);
+ break;
+ case PROP_HAS_AUDIO:
+ PAROLE_STREAM_GET_PRIVATE (stream)->has_audio = g_value_get_boolean (value);
+ break;
+ case PROP_HAS_VIDEO:
+ PAROLE_STREAM_GET_PRIVATE (stream)->has_video = g_value_get_boolean (value);
+ break;
+ case PROP_SEEKABLE:
+ PAROLE_STREAM_GET_PRIVATE (stream)->seekable = g_value_get_boolean (value);
+ break;
+ case PROP_DISP_PAR_D:
+ PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_d = g_value_get_uint (value);
+ break;
+ case PROP_DISP_PAR_N:
+ PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_n = g_value_get_uint (value);
+ break;
+ case PROP_TRACKS:
+ PAROLE_STREAM_GET_PRIVATE (stream)->tracks = g_value_get_uint (value);
+ break;
+ case PROP_TRACK:
+ PAROLE_STREAM_GET_PRIVATE (stream)->track = g_value_get_uint (value);
+ break;
+ case PROP_TAG_AVAILABLE:
+ PAROLE_STREAM_GET_PRIVATE (stream)->tag_available = g_value_get_boolean (value);
+ break;
+ case PROP_DURATION:
+ PAROLE_STREAM_GET_PRIVATE (stream)->duration = g_value_get_int64 (value);
+ break;
+ case PROP_ABSOLUTE_DURATION:
+ PAROLE_STREAM_GET_PRIVATE (stream)->absolute_duration = g_value_get_int64 (value);
+ break;
+ case PROP_VIDEO_HEIGHT:
+ PAROLE_STREAM_GET_PRIVATE (stream)->video_h = g_value_get_int (value);
+ break;
+ case PROP_VIDEO_WIDTH:
+ PAROLE_STREAM_GET_PRIVATE (stream)->video_w = g_value_get_int (value);
+ break;
+ case PROP_TITLE:
+ PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->title, value);
+ break;
+ case PROP_ARTIST:
+ PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->artist, value);
+ break;
+ case PROP_YEAR:
+ PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->year, value);
+ break;
+ case PROP_ALBUM:
+ PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->album, value);
+ break;
+ case PROP_COMMENT:
+ PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE (stream)->comment, value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
static void parole_stream_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
ParoleStream *stream;
stream = PAROLE_STREAM (object);
switch (prop_id)
{
- case PROP_URI:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->uri);
- break;
- case PROP_SUBTITLES:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->subtitles);
- break;
- case PROP_LIVE:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->live);
- break;
- case PROP_MEDIA_TYPE:
- g_value_set_enum (value, PAROLE_STREAM_GET_PRIVATE (stream)->media_type);
- break;
- case PROP_HAS_AUDIO:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->has_audio);
- break;
- case PROP_HAS_VIDEO:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->has_video);
- break;
- case PROP_SEEKABLE:
- g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->seekable);
- break;
- case PROP_DISP_PAR_D:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_d);
- break;
- case PROP_DISP_PAR_N:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_n);
- break;
- case PROP_DURATION:
- g_value_set_int64 (value, PAROLE_STREAM_GET_PRIVATE (stream)->duration);
- break;
- case PROP_TRACKS:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->tracks);
- break;
- case PROP_TRACK:
- g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->track);
- break;
- case PROP_TAG_AVAILABLE:
- g_value_set_double (value, PAROLE_STREAM_GET_PRIVATE (stream)->tag_available);
- break;
- case PROP_ABSOLUTE_DURATION:
- g_value_set_int64 (value, PAROLE_STREAM_GET_PRIVATE (stream)->absolute_duration);
- break;
- case PROP_VIDEO_HEIGHT:
- g_value_set_int (value, PAROLE_STREAM_GET_PRIVATE (stream)->video_h);
- break;
- case PROP_VIDEO_WIDTH:
- g_value_set_int (value, PAROLE_STREAM_GET_PRIVATE (stream)->video_w);
- break;
- case PROP_TITLE:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->title);
- break;
- case PROP_ARTIST:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->artist);
- break;
- case PROP_YEAR:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->year);
- break;
- case PROP_ALBUM:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->album);
- break;
- case PROP_COMMENT:
- g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->comment);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
+ case PROP_URI:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->uri);
+ break;
+ case PROP_SUBTITLES:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->subtitles);
+ break;
+ case PROP_LIVE:
+ g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->live);
+ break;
+ case PROP_MEDIA_TYPE:
+ g_value_set_enum (value, PAROLE_STREAM_GET_PRIVATE (stream)->media_type);
+ break;
+ case PROP_HAS_AUDIO:
+ g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->has_audio);
+ break;
+ case PROP_HAS_VIDEO:
+ g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->has_video);
+ break;
+ case PROP_SEEKABLE:
+ g_value_set_boolean (value, PAROLE_STREAM_GET_PRIVATE (stream)->seekable);
+ break;
+ case PROP_DISP_PAR_D:
+ g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_d);
+ break;
+ case PROP_DISP_PAR_N:
+ g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->disp_par_n);
+ break;
+ case PROP_DURATION:
+ g_value_set_int64 (value, PAROLE_STREAM_GET_PRIVATE (stream)->duration);
+ break;
+ case PROP_TRACKS:
+ g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->tracks);
+ break;
+ case PROP_TRACK:
+ g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE (stream)->track);
+ break;
+ case PROP_TAG_AVAILABLE:
+ g_value_set_double (value, PAROLE_STREAM_GET_PRIVATE (stream)->tag_available);
+ break;
+ case PROP_ABSOLUTE_DURATION:
+ g_value_set_int64 (value, PAROLE_STREAM_GET_PRIVATE (stream)->absolute_duration);
+ break;
+ case PROP_VIDEO_HEIGHT:
+ g_value_set_int (value, PAROLE_STREAM_GET_PRIVATE (stream)->video_h);
+ break;
+ case PROP_VIDEO_WIDTH:
+ g_value_set_int (value, PAROLE_STREAM_GET_PRIVATE (stream)->video_w);
+ break;
+ case PROP_TITLE:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->title);
+ break;
+ case PROP_ARTIST:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->artist);
+ break;
+ case PROP_YEAR:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->year);
+ break;
+ case PROP_ALBUM:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->album);
+ break;
+ case PROP_COMMENT:
+ g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE (stream)->comment);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
}
@@ -322,12 +322,12 @@ parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
stream = PAROLE_STREAM (object);
if ( PAROLE_STREAM_GET_PRIVATE (stream)->image )
- g_object_unref(G_OBJECT(PAROLE_STREAM_GET_PRIVATE (stream)->image));
+ g_object_unref(G_OBJECT(PAROLE_STREAM_GET_PRIVATE (stream)->image));
if (pixbuf)
- PAROLE_STREAM_GET_PRIVATE (stream)->image = gdk_pixbuf_copy(pixbuf);
+ PAROLE_STREAM_GET_PRIVATE (stream)->image = gdk_pixbuf_copy(pixbuf);
else
- PAROLE_STREAM_GET_PRIVATE (stream)->image = NULL;
+ PAROLE_STREAM_GET_PRIVATE (stream)->image = NULL;
}
GdkPixbuf *
@@ -339,9 +339,9 @@ parole_stream_get_image (GObject *object)
stream = PAROLE_STREAM (object);
if (PAROLE_STREAM_GET_PRIVATE (stream)->image)
- pixbuf = gdk_pixbuf_copy(GDK_PIXBUF(PAROLE_STREAM_GET_PRIVATE (stream)->image));
+ pixbuf = gdk_pixbuf_copy(GDK_PIXBUF(PAROLE_STREAM_GET_PRIVATE (stream)->image));
else
- pixbuf = NULL;
+ pixbuf = NULL;
return pixbuf;
}
@@ -364,12 +364,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_URI,
- g_param_spec_string ("uri",
- "Uri",
- "Uri",
- NULL,
- G_PARAM_READWRITE));
+ PROP_URI,
+ g_param_spec_string ("uri",
+ "Uri",
+ "Uri",
+ NULL,
+ G_PARAM_READWRITE));
/**
* ParoleStream:subtitles:
@@ -380,12 +380,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_SUBTITLES,
- g_param_spec_string ("subtitles",
- "Subtitles",
- "Subtitle file",
- NULL,
- G_PARAM_READWRITE));
+ PROP_SUBTITLES,
+ g_param_spec_string ("subtitles",
+ "Subtitles",
+ "Subtitle file",
+ NULL,
+ G_PARAM_READWRITE));
/**
* ParoleStream:has-audio:
@@ -395,12 +395,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_HAS_AUDIO,
- g_param_spec_boolean ("has-audio",
- "Has audio",
- "Has audio",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_HAS_AUDIO,
+ g_param_spec_boolean ("has-audio",
+ "Has audio",
+ "Has audio",
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleStream:has-video:
*
@@ -409,12 +409,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_HAS_VIDEO,
- g_param_spec_boolean ("has-video",
- "Has video",
- "Has video",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_HAS_VIDEO,
+ g_param_spec_boolean ("has-video",
+ "Has video",
+ "Has video",
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleStream:live:
@@ -424,28 +424,28 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_LIVE,
- g_param_spec_boolean ("live",
- "Live",
- "Live",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_LIVE,
+ g_param_spec_boolean ("live",
+ "Live",
+ "Live",
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleStream:media-type:
*
- * The media type.
+ * The media type.
*
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_MEDIA_TYPE,
- g_param_spec_enum ("media-type",
- "Media type",
- "Media type",
- PAROLE_ENUM_TYPE_MEDIA_TYPE,
- PAROLE_MEDIA_TYPE_UNKNOWN,
- G_PARAM_READWRITE));
+ PROP_MEDIA_TYPE,
+ g_param_spec_enum ("media-type",
+ "Media type",
+ "Media type",
+ PAROLE_ENUM_TYPE_MEDIA_TYPE,
+ PAROLE_MEDIA_TYPE_UNKNOWN,
+ G_PARAM_READWRITE));
/**
* ParoleStream:seekable:
@@ -456,12 +456,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_SEEKABLE,
- g_param_spec_boolean ("seekable",
- "Seekable",
- "Seekable",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_SEEKABLE,
+ g_param_spec_boolean ("seekable",
+ "Seekable",
+ "Seekable",
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleStream:duration:
@@ -471,13 +471,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_DURATION,
- g_param_spec_int64 ("duration",
- "Duration",
- "Duration",
- 0, G_MAXINT64,
- 0,
- G_PARAM_READWRITE));
+ PROP_DURATION,
+ g_param_spec_int64 ("duration",
+ "Duration",
+ "Duration",
+ 0, G_MAXINT64,
+ 0,
+ G_PARAM_READWRITE));
/**
* ParoleStream:tag-available:
@@ -487,12 +487,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_TAG_AVAILABLE,
- g_param_spec_boolean ("tag-available",
- "Tag available",
- "Tag available",
- FALSE,
- G_PARAM_READWRITE));
+ PROP_TAG_AVAILABLE,
+ g_param_spec_boolean ("tag-available",
+ "Tag available",
+ "Tag available",
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleStream:absolute-duration:
@@ -502,13 +502,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_ABSOLUTE_DURATION,
- g_param_spec_int64 ("absolute-duration",
- "Absolution duration",
- "Absolution duration",
- 0, G_MAXINT64,
- 0,
- G_PARAM_READWRITE));
+ PROP_ABSOLUTE_DURATION,
+ g_param_spec_int64 ("absolute-duration",
+ "Absolution duration",
+ "Absolution duration",
+ 0, G_MAXINT64,
+ 0,
+ G_PARAM_READWRITE));
/**
* ParoleStream:disp-par-n:
@@ -518,14 +518,14 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_DISP_PAR_N,
- g_param_spec_uint ("disp-par-n",
- "Disp par n",
- "Disp par n",
- 1, G_MAXUINT,
- 1,
- G_PARAM_READWRITE));
-
+ PROP_DISP_PAR_N,
+ g_param_spec_uint ("disp-par-n",
+ "Disp par n",
+ "Disp par n",
+ 1, G_MAXUINT,
+ 1,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:disp-par-n:
*
@@ -534,14 +534,14 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_DISP_PAR_D,
- g_param_spec_uint ("disp-par-d",
- "Disp par d",
- "Disp par d",
- 1, G_MAXUINT,
- 1,
- G_PARAM_READWRITE));
-
+ PROP_DISP_PAR_D,
+ g_param_spec_uint ("disp-par-d",
+ "Disp par d",
+ "Disp par d",
+ 1, G_MAXUINT,
+ 1,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:video-width:
*
@@ -550,14 +550,14 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_VIDEO_WIDTH,
- g_param_spec_int ("video-width",
- "Video width",
- "Video width",
- 0, G_MAXINT,
- 0,
- G_PARAM_READWRITE));
-
+ PROP_VIDEO_WIDTH,
+ g_param_spec_int ("video-width",
+ "Video width",
+ "Video width",
+ 0, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:video-height:
*
@@ -566,14 +566,14 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_VIDEO_HEIGHT,
- g_param_spec_int ("video-height",
- "Video height",
- "Video height",
- 0, G_MAXINT,
- 0,
- G_PARAM_READWRITE));
-
+ PROP_VIDEO_HEIGHT,
+ g_param_spec_int ("video-height",
+ "Video height",
+ "Video height",
+ 0, G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:num-tracks:
*
@@ -583,14 +583,14 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_TRACKS,
- g_param_spec_uint ("num-tracks",
- "Num tracks",
- "Number of tracks in the audio disc",
- 1, 99,
- 1,
- G_PARAM_READWRITE));
-
+ PROP_TRACKS,
+ g_param_spec_uint ("num-tracks",
+ "Num tracks",
+ "Number of tracks in the audio disc",
+ 1, 99,
+ 1,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:track:
*
@@ -601,13 +601,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_TRACK,
- g_param_spec_uint ("track",
- "Track",
- "Track",
- 0, 99,
- 1,
- G_PARAM_READWRITE));
+ PROP_TRACK,
+ g_param_spec_uint ("track",
+ "Track",
+ "Track",
+ 0, 99,
+ 1,
+ G_PARAM_READWRITE));
/**
* ParoleStream:title:
*
@@ -616,12 +616,12 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_TITLE,
- g_param_spec_string ("title",
- "Title",
- "Title",
- NULL,
- G_PARAM_READWRITE));
+ PROP_TITLE,
+ g_param_spec_string ("title",
+ "Title",
+ "Title",
+ NULL,
+ G_PARAM_READWRITE));
/**
@@ -632,13 +632,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_ARTIST,
- g_param_spec_string ("artist",
- "Artist",
- "Artist",
- NULL,
- G_PARAM_READWRITE));
-
+ PROP_ARTIST,
+ g_param_spec_string ("artist",
+ "Artist",
+ "Artist",
+ NULL,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:year:
*
@@ -647,13 +647,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_YEAR,
- g_param_spec_string ("year",
- "Year",
- "Year",
- NULL,
- G_PARAM_READWRITE));
-
+ PROP_YEAR,
+ g_param_spec_string ("year",
+ "Year",
+ "Year",
+ NULL,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:album:
*
@@ -662,13 +662,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_ALBUM,
- g_param_spec_string ("album",
- "Album",
- "Album",
- NULL,
- G_PARAM_READWRITE));
-
+ PROP_ALBUM,
+ g_param_spec_string ("album",
+ "Album",
+ "Album",
+ NULL,
+ G_PARAM_READWRITE));
+
/**
* ParoleStream:comment:
*
@@ -677,13 +677,13 @@ parole_stream_class_init (ParoleStreamClass *klass)
* Since: 0.2
**/
g_object_class_install_property (object_class,
- PROP_COMMENT,
- g_param_spec_string ("comment",
- "Comment",
- "Comment",
- NULL,
- G_PARAM_READWRITE));
-
+ PROP_COMMENT,
+ g_param_spec_string ("comment",
+ "Comment",
+ "Comment",
+ NULL,
+ G_PARAM_READWRITE));
+
g_type_class_add_private (klass, sizeof (ParoleStreamPrivate));
}
diff --git a/src/misc/parole-stream.h b/src/misc/parole-stream.h
index 04f0b89..e11a32c 100644
--- a/src/misc/parole-stream.h
+++ b/src/misc/parole-stream.h
@@ -66,24 +66,25 @@ typedef struct _ParoleStreamClass ParoleStreamClass;
struct _ParoleStream
{
- GObject parent;
+ GObject parent;
};
struct _ParoleStreamClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
};
-GType parole_stream_get_type (void) G_GNUC_CONST;
+GType parole_stream_get_type (void) G_GNUC_CONST;
-void parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf);
+void parole_stream_set_image (GObject *object,
+ GdkPixbuf *pixbuf);
-GdkPixbuf *parole_stream_get_image (GObject *object);
+GdkPixbuf *parole_stream_get_image (GObject *object);
-ParoleStream *parole_stream_new (void);
+ParoleStream *parole_stream_new (void);
-void parole_stream_init_properties (ParoleStream *stream);
+void parole_stream_init_properties (ParoleStream *stream);
G_END_DECLS
More information about the Xfce4-commits
mailing list