[Xfce4-commits] [apps/parole] 01/01: cpplint: Final batch of whitespace fixes { should almost always be at the end of the previous line [whitespace/braces] [4] Extra space after ( [whitespace/parens] [2] Extra space before ( in function call [whitespace/parens] [4] If an else has a brace on one side, it should have it on both [readability/braces] [5] Mismatching spaces inside () in for [whitespace/parens] [5] Mismatching spaces inside () in if [whitespace/parens] [5]
noreply at xfce.org
noreply at xfce.org
Wed May 31 02:58:51 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/parole.
commit 157600ba94373ba45bfde30e67558f5eb4f599a1
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Tue May 30 20:58:33 2017 -0400
cpplint: Final batch of whitespace fixes
{ should almost always be at the end of the previous line [whitespace/braces] [4]
Extra space after ( [whitespace/parens] [2]
Extra space before ( in function call [whitespace/parens] [4]
If an else has a brace on one side, it should have it on both [readability/braces] [5]
Mismatching spaces inside () in for [whitespace/parens] [5]
Mismatching spaces inside () in if [whitespace/parens] [5]
---
src/common/parole-common.c | 30 +-
src/common/parole-rc-utils.c | 27 +-
src/common/parole-screensaver.c | 18 +-
src/common/parole-screensaver.h | 6 +-
src/dbus/parole-dbus.c | 33 +-
src/gst/parole-gst.c | 659 ++++++++++----------------
src/gst/parole-gst.h | 12 +-
src/main.c | 77 ++--
src/misc/parole-debug.c | 6 +-
src/misc/parole-file.c | 233 ++++------
src/misc/parole-file.h | 6 +-
src/misc/parole-filters.c | 24 +-
src/misc/parole-pl-parser.c | 200 +++-----
src/misc/parole-pl-parser.h | 3 +-
src/misc/parole-provider-player.c | 125 ++---
src/misc/parole-provider-player.h | 6 +-
src/misc/parole-provider-plugin.c | 31 +-
src/misc/parole-provider-plugin.h | 3 +-
src/misc/parole-stream.c | 361 +++++++--------
src/misc/parole-stream.h | 12 +-
src/parole-about.c | 9 +-
src/parole-builder.c | 9 +-
src/parole-button.c | 60 +--
src/parole-button.h | 9 +-
src/parole-clutter.c | 90 ++--
src/parole-clutter.h | 6 +-
src/parole-conf-dialog.c | 88 ++--
src/parole-conf-dialog.h | 6 +-
src/parole-conf.c | 494 ++++++++++----------
src/parole-disc.c | 91 ++--
src/parole-disc.h | 9 +-
src/parole-mediachooser.c | 101 ++--
src/parole-medialist.c | 551 ++++++++--------------
src/parole-medialist.h | 16 +-
src/parole-module.c | 57 +--
src/parole-module.h | 6 +-
src/parole-open-location.c | 57 +--
src/parole-player.c | 863 +++++++++++++----------------------
src/parole-player.h | 9 +-
src/parole-plugin-player.c | 86 ++--
src/parole-plugin-player.h | 6 +-
src/parole-plugins-manager.c | 163 +++----
src/parole-plugins-manager.h | 6 +-
src/parole-shortcuts.c | 18 +-
src/parole-subtitle-encoding.c | 47 +-
src/parole-utils.c | 138 ++----
src/parole-vis.c | 9 +-
src/plugins/mpris2/mpris2-plugin.c | 6 +-
src/plugins/mpris2/mpris2-provider.c | 287 +++++-------
src/plugins/notify/notify-plugin.c | 6 +-
src/plugins/notify/notify-provider.c | 108 ++---
src/plugins/sample/sample-plugin.c | 6 +-
src/plugins/sample/sample-provider.c | 24 +-
src/plugins/tray/tray-plugin.c | 6 +-
src/plugins/tray/tray-provider.c | 85 ++--
55 files changed, 2041 insertions(+), 3363 deletions(-)
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index c3f2e17..7f62bd4 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -35,13 +35,11 @@
#include "parole-common.h"
gboolean
-parole_widget_reparent(GtkWidget *widget, GtkWidget *new_parent)
-{
+parole_widget_reparent(GtkWidget *widget, GtkWidget *new_parent) {
GtkWidget *parent;
parent = gtk_widget_get_parent(widget);
- if (parent)
- {
+ if (parent) {
g_object_ref(widget);
gtk_container_remove(GTK_CONTAINER(parent), widget);
gtk_container_add(GTK_CONTAINER(new_parent), widget);
@@ -55,11 +53,10 @@ parole_widget_reparent(GtkWidget *widget, GtkWidget *new_parent)
static void
parole_dialog_show(GtkWindow *parent,
- GtkMessageType type,
- const gchar *window_title,
- const gchar *title,
- const gchar *msg)
-{
+ GtkMessageType type,
+ const gchar *window_title,
+ const gchar *title,
+ const gchar *msg) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new_with_markup(parent,
@@ -82,19 +79,16 @@ parole_dialog_show(GtkWindow *parent,
gtk_widget_show_all(dialog);
}
-void parole_dialog_info(GtkWindow *parent, const gchar *title, const gchar *msg)
-{
+void parole_dialog_info(GtkWindow *parent, const gchar *title, const gchar *msg) {
parole_dialog_show(parent, GTK_MESSAGE_INFO, _("Message"), title, msg);
}
-void parole_dialog_error(GtkWindow *parent, const gchar *title, const gchar *msg)
-{
+void parole_dialog_error(GtkWindow *parent, const gchar *title, const gchar *msg) {
parole_dialog_show(parent, GTK_MESSAGE_ERROR, _("Error"), title, msg);
}
-void parole_window_busy_cursor(GdkWindow *window)
-{
+void parole_window_busy_cursor(GdkWindow *window) {
GdkCursor *cursor = NULL;
if ( G_UNLIKELY (window == NULL) )
@@ -110,8 +104,7 @@ void parole_window_busy_cursor(GdkWindow *window)
gdk_flush();
}
-void parole_window_invisible_cursor(GdkWindow *window)
-{
+void parole_window_invisible_cursor(GdkWindow *window) {
GdkCursor *cursor = NULL;
if ( G_UNLIKELY (window == NULL) )
@@ -127,8 +120,7 @@ void parole_window_invisible_cursor(GdkWindow *window)
gdk_flush();
}
-void parole_window_normal_cursor(GdkWindow *window)
-{
+void parole_window_normal_cursor(GdkWindow *window) {
if ( G_UNLIKELY (window == NULL) )
return;
diff --git a/src/common/parole-rc-utils.c b/src/common/parole-rc-utils.c
index e403048..d6218ea 100644
--- a/src/common/parole-rc-utils.c
+++ b/src/common/parole-rc-utils.c
@@ -33,8 +33,7 @@
#include "parole-rc-utils.h"
XfceRc *
-parole_get_resource_file(const gchar *group, gboolean readonly)
-{
+parole_get_resource_file(const gchar *group, gboolean readonly) {
gchar *file;
XfceRc *rc;
@@ -49,8 +48,7 @@ parole_get_resource_file(const gchar *group, gboolean readonly)
return rc;
}
-gchar **parole_get_history_full(const gchar *relpath)
-{
+gchar **parole_get_history_full(const gchar *relpath) {
gchar **lines = NULL;
gchar *history = NULL;
gchar *contents = NULL;
@@ -58,8 +56,7 @@ gchar **parole_get_history_full(const gchar *relpath)
history = xfce_resource_lookup(XFCE_RESOURCE_CACHE, relpath);
- if (history && g_file_get_contents (history, &contents, &length, NULL))
- {
+ if (history && g_file_get_contents(history, &contents, &length, NULL)) {
lines = g_strsplit(contents, "\n", -1);
g_free(contents);
}
@@ -69,18 +66,15 @@ gchar **parole_get_history_full(const gchar *relpath)
return lines;
}
-gchar **parole_get_history(void)
-{
+gchar **parole_get_history(void) {
return parole_get_history_full (PAROLE_HISTORY_FILE);
}
-void parole_insert_line_history(const gchar *line)
-{
+void parole_insert_line_history(const gchar *line) {
parole_insert_line_history_full(PAROLE_HISTORY_FILE, line);
}
-void parole_insert_line_history_full(const gchar *relpath, const gchar *line)
-{
+void parole_insert_line_history_full(const gchar *relpath, const gchar *line) {
gchar *history = NULL;
history = xfce_resource_save_location(XFCE_RESOURCE_CACHE, relpath, TRUE);
@@ -96,19 +90,16 @@ void parole_insert_line_history_full(const gchar *relpath, const gchar *line)
}
}
-void parole_clear_history_file(void)
-{
+void parole_clear_history_file(void) {
parole_clear_history_file_full(PAROLE_HISTORY_FILE);
}
-void parole_clear_history_file_full(const gchar *relpath)
-{
+void parole_clear_history_file_full(const gchar *relpath) {
gchar *history = NULL;
history = xfce_resource_save_location(XFCE_RESOURCE_CACHE, relpath, FALSE);
- if ( history )
- {
+ if ( history ) {
FILE *f;
f = fopen(history, "w");
fclose(f);
diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c
index 6fdace3..d49e49e 100644
--- a/src/common/parole-screensaver.c
+++ b/src/common/parole-screensaver.c
@@ -45,35 +45,30 @@ G_DEFINE_TYPE(ParoleScreenSaver, parole_screen_saver, G_TYPE_OBJECT)
static void
-parole_screen_saver_finalize(GObject *object)
-{
+parole_screen_saver_finalize(GObject *object) {
G_OBJECT_CLASS(parole_screen_saver_parent_class)->finalize(object);
}
static void
-parole_screen_saver_class_init(ParoleScreenSaverClass *klass)
-{
+parole_screen_saver_class_init(ParoleScreenSaverClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_screen_saver_finalize;
}
static void
-parole_screen_saver_init(ParoleScreenSaver *saver)
-{
+parole_screen_saver_init(ParoleScreenSaver *saver) {
return;
}
ParoleScreenSaver *
-parole_screen_saver_new(void)
-{
+parole_screen_saver_new(void) {
ParoleScreenSaver *saver = NULL;
saver = g_object_new(PAROLE_TYPE_SCREENSAVER, NULL);
return saver;
}
-void parole_screen_saver_inhibit(ParoleScreenSaver *saver, GtkWindow *window)
-{
+void parole_screen_saver_inhibit(ParoleScreenSaver *saver, GtkWindow *window) {
gchar *cmd;
gint returncode;
@@ -87,8 +82,7 @@ void parole_screen_saver_inhibit(ParoleScreenSaver *saver, GtkWindow *window)
g_free(cmd);
}
-void parole_screen_saver_uninhibit(ParoleScreenSaver *saver, GtkWindow *window)
-{
+void parole_screen_saver_uninhibit(ParoleScreenSaver *saver, GtkWindow *window) {
gchar *cmd;
gint returncode;
diff --git a/src/common/parole-screensaver.h b/src/common/parole-screensaver.h
index 3436ca6..aef6f24 100644
--- a/src/common/parole-screensaver.h
+++ b/src/common/parole-screensaver.h
@@ -32,13 +32,11 @@ G_BEGIN_DECLS
#define PAROLE_SCREEN_SAVER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_SCREENSAVER, ParoleScreenSaver))
#define PAROLE_IS_SCREENSAVER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_SCREENSAVER))
-typedef struct
-{
+typedef struct {
GObject parent;
} ParoleScreenSaver;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
} ParoleScreenSaverClass;
diff --git a/src/dbus/parole-dbus.c b/src/dbus/parole-dbus.c
index 3eb1358..0b6b44e 100644
--- a/src/dbus/parole-dbus.c
+++ b/src/dbus/parole-dbus.c
@@ -36,20 +36,17 @@
#include "parole-dbus.h"
static void
-proxy_destroy_cb(DBusGConnection *bus)
-{
+proxy_destroy_cb(DBusGConnection *bus) {
dbus_g_connection_unref(bus);
}
static DBusConnection *
-parole_session_bus_get(void)
-{
+parole_session_bus_get(void) {
return dbus_g_connection_get_connection (parole_g_session_bus_get ());
}
DBusGConnection *
-parole_g_session_bus_get(void)
-{
+parole_g_session_bus_get(void) {
static gboolean session_bus_connected = FALSE;
DBusGConnection *bus;
GError *error = NULL;
@@ -59,8 +56,7 @@ parole_g_session_bus_get(void)
} else {
bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
- if ( error )
- {
+ if ( error ) {
g_error("%s", error->message);
}
session_bus_connected = TRUE;
@@ -70,8 +66,7 @@ parole_g_session_bus_get(void)
}
DBusGProxy *
-parole_get_proxy(const gchar *path, const gchar *iface)
-{
+parole_get_proxy(const gchar *path, const gchar *iface) {
DBusGConnection *bus;
DBusGProxy *proxy;
@@ -92,8 +87,7 @@ parole_get_proxy(const gchar *path, const gchar *iface)
}
gboolean
-parole_dbus_name_has_owner(const gchar *name)
-{
+parole_dbus_name_has_owner(const gchar *name) {
DBusConnection *bus;
DBusError error;
gboolean ret;
@@ -106,8 +100,7 @@ parole_dbus_name_has_owner(const gchar *name)
dbus_connection_unref(bus);
- if ( dbus_error_is_set (&error) )
- {
+ if (dbus_error_is_set(&error)) {
g_warning("Failed to get name owner: %s\n", error.message);
dbus_error_free(&error);
}
@@ -115,8 +108,7 @@ parole_dbus_name_has_owner(const gchar *name)
return ret;
}
-gboolean parole_dbus_register_name(const gchar *name)
-{
+gboolean parole_dbus_register_name(const gchar *name) {
DBusConnection *bus;
DBusError error;
int ret;
@@ -133,8 +125,7 @@ gboolean parole_dbus_register_name(const gchar *name)
dbus_connection_unref(bus);
- if ( dbus_error_is_set (&error) )
- {
+ if (dbus_error_is_set(&error)) {
g_warning("Error: %s\n", error.message);
dbus_error_free(&error);
return FALSE;
@@ -143,8 +134,7 @@ gboolean parole_dbus_register_name(const gchar *name)
return ret == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ? TRUE : FALSE;
}
-gboolean parole_dbus_release_name(const gchar *name)
-{
+gboolean parole_dbus_release_name(const gchar *name) {
DBusConnection *bus;
DBusError error;
int ret;
@@ -160,8 +150,7 @@ gboolean parole_dbus_release_name(const gchar *name)
dbus_connection_unref(bus);
- if ( dbus_error_is_set (&error) )
- {
+ if (dbus_error_is_set(&error)) {
g_warning("Error: %s\n", error.message);
dbus_error_free(&error);
return FALSE;
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 0cd1d27..2f5d3d0 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -80,8 +80,7 @@ static GdkPixbuf *parole_gst_tag_list_get_cover_embedded(ParoleGst *gst,
static GdkPixbuf *parole_gst_tag_list_get_cover(ParoleGst *gst,
GstTagList *tag_list);
-typedef enum
-{
+typedef enum {
GST_PLAY_FLAG_VIDEO = (1 << 0),
GST_PLAY_FLAG_AUDIO = (1 << 1),
GST_PLAY_FLAG_TEXT = (1 << 2),
@@ -94,15 +93,13 @@ typedef enum
GST_PLAY_FLAG_DEINTERLACE = (1 << 9)
} GstPlayFlags;
-typedef enum
-{
+typedef enum {
XIMAGESINK,
XVIMAGESINK,
CLUTTERSINK
} ParoleGstVideoSink;
-struct ParoleGstPrivate
-{
+struct ParoleGstPrivate {
GstElement *playbin;
GstElement *video_sink;
GstElement *audio_sink;
@@ -148,8 +145,7 @@ struct ParoleGstPrivate
gulong sig2;
};
-enum
-{
+enum {
MEDIA_STATE,
MEDIA_PROGRESSED,
MEDIA_TAG,
@@ -161,8 +157,7 @@ enum
LAST_SIGNAL
};
-enum
-{
+enum {
PROP_0,
PROP_VOLUME,
PROP_CONF_OBJ,
@@ -176,16 +171,14 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE(ParoleGst, parole_gst, GTK_TYPE_WIDGET)
static void
-parole_gst_finalize(GObject *object)
-{
+parole_gst_finalize(GObject *object) {
ParoleGst *gst;
gst = PAROLE_GST(object);
TRACE("start");
- if ( gst->priv->tick_id != 0)
- {
+ if (gst->priv->tick_id != 0) {
g_source_remove(gst->priv->tick_id);
gst->priv->tick_id = 0;
}
@@ -207,14 +200,12 @@ parole_gst_finalize(GObject *object)
}
static gboolean
-parole_gst_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, ParoleGst *gst)
-{
+parole_gst_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, ParoleGst *gst) {
return FALSE;
}
static gboolean
-parole_gst_parent_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
-{
+parole_gst_parent_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data) {
cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
cairo_paint(cr);
@@ -222,8 +213,7 @@ parole_gst_parent_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_dat
}
static void
-parole_gst_realize(GtkWidget *widget)
-{
+parole_gst_realize(GtkWidget *widget) {
ParoleGst *gst;
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
GdkWindowAttr attr;
@@ -275,8 +265,7 @@ parole_gst_realize(GtkWidget *widget)
}
static void
-parole_gst_show(GtkWidget *widget)
-{
+parole_gst_show(GtkWidget *widget) {
if ( gtk_widget_get_window(widget) )
gdk_window_show(gtk_widget_get_window(widget));
@@ -285,8 +274,7 @@ parole_gst_show(GtkWidget *widget)
}
static void
-parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h)
-{
+parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h) {
/*
* Default values returned if:
* 1) We are not playing.
@@ -299,8 +287,7 @@ parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h)
*ret_h = allocation->height;
g_free(allocation);
- if ( gst->priv->state >= GST_STATE_PAUSED )
- {
+ if ( gst->priv->state >= GST_STATE_PAUSED ) {
gboolean has_video;
guint video_w, video_h;
guint video_par_n, video_par_d;
@@ -308,19 +295,16 @@ parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h)
guint disp_par_n, disp_par_d;
g_object_get(G_OBJECT(gst->priv->stream),
- "has-video", &has_video,
- "video-width", &video_w,
- "video-height", &video_h,
- "disp-par-n", &disp_par_n,
- "disp-par-d", &disp_par_d,
- NULL);
-
- if ( has_video )
- {
- if ( video_w != 0 && video_h != 0 )
- {
- switch ( gst->priv->aspect_ratio )
- {
+ "has-video", &has_video,
+ "video-width", &video_w,
+ "video-height", &video_h,
+ "disp-par-n", &disp_par_n,
+ "disp-par-d", &disp_par_d,
+ NULL);
+
+ if ( has_video ) {
+ if ( video_w != 0 && video_h != 0 ) {
+ switch ( gst->priv->aspect_ratio ) {
case PAROLE_ASPECT_RATIO_NONE:
return;
case PAROLE_ASPECT_RATIO_AUTO:
@@ -350,8 +334,7 @@ parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h)
if ( gst_video_calculate_display_ratio (&dar_n, &dar_d,
video_w, video_h,
video_par_n, video_par_d,
- disp_par_n, disp_par_d) )
- {
+ disp_par_n, disp_par_d) ) {
if (video_w % dar_n == 0) {
*ret_w = video_w;
*ret_h =(guint) gst_util_uint64_scale(video_w, dar_d, dar_n);
@@ -367,8 +350,7 @@ parole_gst_get_video_output_size(ParoleGst *gst, gint *ret_w, gint *ret_h)
}
static void
-parole_gst_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
+parole_gst_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
#ifdef HAVE_CLUTTER
ParoleGst *gst;
#endif
@@ -381,8 +363,7 @@ parole_gst_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
gtk_widget_set_allocation(widget, allocation);
- if ( gtk_widget_get_realized (widget) )
- {
+ if (gtk_widget_get_realized(widget)) {
gint w, h;
gdouble ratio, width, height;
@@ -413,8 +394,7 @@ parole_gst_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
}
static void
-parole_gst_set_video_color_balance(ParoleGst *gst)
-{
+parole_gst_set_video_color_balance(ParoleGst *gst) {
GstElement *video_sink;
gint brightness_value;
@@ -454,8 +434,7 @@ parole_gst_set_video_color_balance(ParoleGst *gst)
}
static void
-parole_gst_set_video_overlay(ParoleGst *gst)
-{
+parole_gst_set_video_overlay(ParoleGst *gst) {
GstElement *video_sink;
g_object_get(G_OBJECT(gst->priv->playbin),
@@ -477,8 +456,7 @@ parole_gst_set_video_overlay(ParoleGst *gst)
}
static void
-parole_gst_query_capabilities(ParoleGst *gst)
-{
+parole_gst_query_capabilities(ParoleGst *gst) {
GstQuery *query;
gboolean seekable;
@@ -499,8 +477,7 @@ parole_gst_query_capabilities(ParoleGst *gst)
}
static gboolean
-parole_gst_tick_timeout(gpointer data)
-{
+parole_gst_tick_timeout(gpointer data) {
ParoleGst *gst;
GstFormat format = GST_FORMAT_TIME;
@@ -523,21 +500,18 @@ parole_gst_tick_timeout(gpointer data)
#else
gst_element_query_position(gst->priv->playbin, &format, &pos);
- if ( G_UNLIKELY (format != GST_FORMAT_TIME ) )
+ if (G_UNLIKELY(format != GST_FORMAT_TIME ))
return FALSE;
#endif
- if ( gst->priv->state == GST_STATE_PLAYING )
- {
- if (duration != 0 && seekable == FALSE)
- {
+ if (gst->priv->state == GST_STATE_PLAYING) {
+ if (duration != 0 && seekable == FALSE) {
parole_gst_query_capabilities(gst);
}
value = pos / GST_SECOND;
- if ( G_LIKELY (value > 0) )
- {
+ if (G_LIKELY(value > 0)) {
g_signal_emit(G_OBJECT(gst), signals[MEDIA_PROGRESSED], 0, gst->priv->stream, value);
}
}
@@ -546,8 +520,7 @@ parole_gst_tick_timeout(gpointer data)
}
static void
-parole_gst_tick(ParoleGst *gst)
-{
+parole_gst_tick(ParoleGst *gst) {
gboolean live;
g_object_get(gst->priv->stream,
@@ -566,8 +539,7 @@ parole_gst_tick(ParoleGst *gst)
}
static void
-parole_gst_query_duration(ParoleGst *gst)
-{
+parole_gst_query_duration(ParoleGst *gst) {
gint64 absolute_duration = 0;
gint64 duration = 0;
gboolean live;
@@ -581,13 +553,11 @@ parole_gst_query_duration(ParoleGst *gst)
#endif
&absolute_duration);
- if (absolute_duration < 0)
- {
+ if (absolute_duration < 0) {
absolute_duration = 0;
}
- if (gst_time == GST_FORMAT_TIME)
- {
+ if (gst_time == GST_FORMAT_TIME) {
duration = absolute_duration / GST_SECOND;
live = (absolute_duration == 0);
@@ -602,8 +572,7 @@ parole_gst_query_duration(ParoleGst *gst)
}
static void
-parole_gst_set_subtitle_font(ParoleGst *gst)
-{
+parole_gst_set_subtitle_font(ParoleGst *gst) {
gchar *font;
g_object_get(G_OBJECT(gst->priv->conf),
@@ -619,8 +588,7 @@ parole_gst_set_subtitle_font(ParoleGst *gst)
}
static void
-parole_gst_set_subtitle_encoding(ParoleGst *gst)
-{
+parole_gst_set_subtitle_encoding(ParoleGst *gst) {
gchar *encoding;
g_object_get(G_OBJECT(gst->priv->conf),
@@ -635,8 +603,7 @@ parole_gst_set_subtitle_encoding(ParoleGst *gst)
}
static void
-parole_gst_load_subtitle(ParoleGst *gst)
-{
+parole_gst_load_subtitle(ParoleGst *gst) {
ParoleMediaType type;
gchar *uri;
gchar *sub;
@@ -662,8 +629,7 @@ parole_gst_load_subtitle(ParoleGst *gst)
"subtitles", &sub,
NULL);
- if ( sub )
- {
+ if ( sub ) {
TRACE("Found subtitle with path %s", sub);
sub_uri = g_filename_to_uri(sub, NULL, NULL);
g_object_set(G_OBJECT(gst->priv->playbin),
@@ -676,8 +642,7 @@ parole_gst_load_subtitle(ParoleGst *gst)
}
static void
-parole_gst_get_pad_capabilities(GObject *object, GParamSpec *pspec, ParoleGst *gst)
-{
+parole_gst_get_pad_capabilities(GObject *object, GParamSpec *pspec, ParoleGst *gst) {
GstPad *pad;
GstStructure *st;
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
@@ -707,8 +672,7 @@ parole_gst_get_pad_capabilities(GObject *object, GParamSpec *pspec, ParoleGst *g
st = gst_caps_get_structure(GST_PAD_CAPS(pad), 0);
#endif
- if ( st )
- {
+ if ( st ) {
gst_structure_get_int(st, "width", &width);
gst_structure_get_int(st, "height", &height);
TRACE("Caps width=%d height=%d\n", width, height);
@@ -718,8 +682,7 @@ parole_gst_get_pad_capabilities(GObject *object, GParamSpec *pspec, ParoleGst *g
"video-height", height,
NULL);
- if ( ( value = gst_structure_get_value (st, "pixel-aspect-ratio")) )
- {
+ if ((value = gst_structure_get_value(st, "pixel-aspect-ratio"))) {
num =(guint) gst_value_get_fraction_numerator(value),
den =(guint) gst_value_get_fraction_denominator(value);
g_object_set(G_OBJECT(gst->priv->stream),
@@ -738,29 +701,26 @@ parole_gst_get_pad_capabilities(GObject *object, GParamSpec *pspec, ParoleGst *g
}
static void
-parole_gst_query_info(ParoleGst *gst)
-{
+parole_gst_query_info(ParoleGst *gst) {
GstPad *videopad = NULL;
gint n_audio, n_video, i;
g_object_get(G_OBJECT(gst->priv->playbin),
- "n-audio", &n_audio,
- "n-video", &n_video,
- NULL);
+ "n-audio", &n_audio,
+ "n-video", &n_video,
+ NULL);
g_object_set(G_OBJECT(gst->priv->stream),
- "has-video", (n_video > 0),
- "has-audio", (n_audio > 0),
- NULL);
+ "has-video", (n_video > 0),
+ "has-audio", (n_audio > 0),
+ NULL);
- if (n_video > 0)
- {
+ if (n_video > 0) {
for (i = 0; i < n_video && videopad == NULL; i++)
g_signal_emit_by_name(gst->priv->playbin, "get-video-pad", i, &videopad);
- if (videopad)
- {
+ if (videopad) {
GstCaps *caps;
#if GST_CHECK_VERSION(1, 0, 0)
@@ -785,24 +745,22 @@ parole_gst_query_info(ParoleGst *gst)
}
static void
-parole_gst_update_stream_info(ParoleGst *gst)
-{
+parole_gst_update_stream_info(ParoleGst *gst) {
TRACE("Updating stream info");
parole_gst_query_info(gst);
}
static void
-parole_gst_update_vis(ParoleGst *gst)
-{
+parole_gst_update_vis(ParoleGst *gst) {
gchar *vis_name;
gint flags;
TRACE("start");
g_object_get(G_OBJECT(gst->priv->conf),
- "vis-enabled", &gst->priv->with_vis,
- "vis-name", &vis_name,
- NULL);
+ "vis-enabled", &gst->priv->with_vis,
+ "vis-name", &vis_name,
+ NULL);
TRACE("Vis name %s enabled %d\n", vis_name, gst->priv->with_vis);
@@ -843,8 +801,7 @@ parole_gst_update_vis(ParoleGst *gst)
}
static void
-parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState pending)
-{
+parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState pending) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
TRACE ("State change new %i old %i pending %i", new, old, pending);
@@ -852,19 +809,16 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
parole_gst_tick(gst);
- if ( gst->priv->target == new )
- {
+ if ( gst->priv->target == new ) {
gtk_widget_queue_draw(GTK_WIDGET(gst));
parole_window_normal_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
- if ( gst->priv->state_change_id != 0 )
- {
+ if ( gst->priv->state_change_id != 0 ) {
g_source_remove(gst->priv->state_change_id);
gst->priv->state_change_id = 0;
}
}
- switch (gst->priv->state)
- {
+ switch (gst->priv->state) {
case GST_STATE_PLAYING:
{
gst->priv->media_state = PAROLE_STATE_PLAYING;
@@ -878,10 +832,8 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
}
case GST_STATE_PAUSED:
{
- if ( gst->priv->target == GST_STATE_PLAYING )
- {
- if ( gst->priv->update_color_balance )
- {
+ if ( gst->priv->target == GST_STATE_PLAYING ) {
+ if ( gst->priv->update_color_balance ) {
parole_gst_set_video_color_balance(gst);
}
}
@@ -925,8 +877,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
}
static void
-parole_gst_element_message_sync(GstBus *bus, GstMessage *message, ParoleGst *gst)
-{
+parole_gst_element_message_sync(GstBus *bus, GstMessage *message, ParoleGst *gst) {
#if GST_CHECK_VERSION(1, 0, 0)
if ( gst_message_has_name (message, "prepare-window-handle") )
#else
@@ -945,8 +896,7 @@ out:
}
static GdkPixbuf *
-parole_gst_buffer_to_pixbuf(GstBuffer *buffer)
-{
+parole_gst_buffer_to_pixbuf(GstBuffer *buffer) {
GdkPixbufLoader *loader;
GdkPixbuf *pixbuf = NULL;
GError *err = NULL;
@@ -964,8 +914,7 @@ parole_gst_buffer_to_pixbuf(GstBuffer *buffer)
#else
if (gdk_pixbuf_loader_write (loader, buffer->data, buffer->size, &err) &&
#endif
- gdk_pixbuf_loader_close(loader, &err))
- {
+ gdk_pixbuf_loader_close(loader, &err)) {
pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
if (pixbuf) {
g_object_ref(pixbuf);
@@ -983,8 +932,7 @@ parole_gst_buffer_to_pixbuf(GstBuffer *buffer)
}
GdkPixbuf *
-parole_gst_tag_list_get_cover_external(ParoleGst *gst)
-{
+parole_gst_tag_list_get_cover_external(ParoleGst *gst) {
GdkPixbuf *pixbuf;
GError *err = NULL;
gchar *uri;
@@ -998,26 +946,23 @@ parole_gst_tag_list_get_cover_external(ParoleGst *gst)
gchar *cover_filename = NULL;
g_object_get(G_OBJECT(gst->priv->stream),
- "uri", &uri,
- NULL);
+ "uri", &uri,
+ NULL);
filename = g_filename_from_uri(uri, NULL, NULL);
- if (!filename)
- {
+ if (!filename) {
return NULL;
}
directory = g_path_get_dirname(filename);
file_dir = g_dir_open(directory, 0, &error);
- if (error)
- {
+ if (error) {
g_error_free(error);
return NULL;
}
- while ( (listing = g_dir_read_name(file_dir)) )
- {
+ while ( (listing = g_dir_read_name(file_dir)) ) {
lower = g_utf8_strdown(listing, -1);
if ( g_strcmp0(lower, "cover.jpg") == 0 )
cover = g_strdup(listing);
@@ -1030,8 +975,7 @@ parole_gst_tag_list_get_cover_external(ParoleGst *gst)
else if ( g_strcmp0(lower, "albumartsmall.jpg") == 0 )
cover = g_strdup(listing);
- if (cover)
- {
+ if (cover) {
cover_filename = g_build_filename(directory, cover, NULL);
break;
}
@@ -1047,8 +991,7 @@ parole_gst_tag_list_get_cover_external(ParoleGst *gst)
pixbuf = gdk_pixbuf_new_from_file(cover_filename, &err);
g_free(cover_filename);
- if (err)
- {
+ if (err) {
g_object_unref(pixbuf);
g_error_free(err);
return NULL;
@@ -1057,8 +1000,7 @@ parole_gst_tag_list_get_cover_external(ParoleGst *gst)
}
GdkPixbuf *
-parole_gst_tag_list_get_cover_embedded(ParoleGst *gst, GstTagList *tag_list)
-{
+parole_gst_tag_list_get_cover_embedded(ParoleGst *gst, GstTagList *tag_list) {
GdkPixbuf *pixbuf;
const GValue *cover_value = NULL;
guint i;
@@ -1122,8 +1064,7 @@ parole_gst_tag_list_get_cover_embedded(ParoleGst *gst, GstTagList *tag_list)
}
GdkPixbuf *
-parole_gst_tag_list_get_cover(ParoleGst *gst, GstTagList *tag_list)
-{
+parole_gst_tag_list_get_cover(ParoleGst *gst, GstTagList *tag_list) {
GdkPixbuf *pixbuf;
GdkPixbuf *scaled;
gint height, width;
@@ -1132,8 +1073,7 @@ parole_gst_tag_list_get_cover(ParoleGst *gst, GstTagList *tag_list)
g_return_val_if_fail(tag_list != NULL, FALSE);
pixbuf = parole_gst_tag_list_get_cover_external(gst);
- if (!pixbuf)
- {
+ if (!pixbuf) {
pixbuf = parole_gst_tag_list_get_cover_embedded(gst, tag_list);
if (!pixbuf)
return NULL;
@@ -1162,8 +1102,7 @@ parole_gst_tag_list_get_cover(ParoleGst *gst, GstTagList *tag_list)
}
static void
-parole_gst_get_meta_data_dvd(ParoleGst *gst)
-{
+parole_gst_get_meta_data_dvd(ParoleGst *gst) {
gint n_chapters;
guint num_chapters = 1;
guint chapter = 1;
@@ -1189,11 +1128,10 @@ parole_gst_get_meta_data_dvd(ParoleGst *gst)
n_chapters = (gint) val;
num_chapters = (guint) n_chapters;
TRACE("Number of chapters: %i", n_chapters);
- if (num_chapters != current_num_chapters)
- {
+ if (num_chapters != current_num_chapters) {
g_object_set(G_OBJECT(gst->priv->stream),
- "num-tracks", num_chapters,
- NULL);
+ "num-tracks", num_chapters,
+ NULL);
TRACE("Updated DVD chapter count: %i", n_chapters);
g_signal_emit(G_OBJECT(gst), signals[DVD_CHAPTER_COUNT_CHANGE], 0,
@@ -1210,11 +1148,10 @@ parole_gst_get_meta_data_dvd(ParoleGst *gst)
#endif
chapter = (guint)(gint) val;
TRACE("Current chapter: %i", chapter);
- if ( chapter != current_chapter || num_chapters != 1 )
- {
+ if ( chapter != current_chapter || num_chapters != 1 ) {
g_object_set(G_OBJECT(gst->priv->stream),
- "track", chapter,
- NULL);
+ "track", chapter,
+ NULL);
TRACE("Updated current DVD chapter: %i", chapter);
if (current_chapter != 1)
@@ -1226,29 +1163,27 @@ parole_gst_get_meta_data_dvd(ParoleGst *gst)
static void
-parole_gst_get_meta_data_cdda(ParoleGst *gst, GstTagList *tag)
-{
+parole_gst_get_meta_data_cdda(ParoleGst *gst, GstTagList *tag) {
guint num_tracks;
guint track;
if (gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, &track) &&
- gst_tag_list_get_uint(tag, GST_TAG_TRACK_COUNT, &num_tracks))
- {
+ gst_tag_list_get_uint(tag, GST_TAG_TRACK_COUNT, &num_tracks)) {
g_object_set(G_OBJECT(gst->priv->stream),
- "num-tracks", num_tracks,
- "track", track,
- "title", g_strdup_printf(_("Track %i"), track),
- "artist", NULL,
- "year", NULL,
- "album", _("Audio CD"),
- "comment", NULL,
- "genre", NULL,
- NULL);
+ "num-tracks", num_tracks,
+ "track", track,
+ "title", g_strdup_printf(_("Track %i"), track),
+ "artist", NULL,
+ "year", NULL,
+ "album", _("Audio CD"),
+ "comment", NULL,
+ "genre", NULL,
+ NULL);
parole_stream_set_image(G_OBJECT(gst->priv->stream), NULL);
g_object_set(G_OBJECT(gst->priv->stream),
- "tag-available", FALSE,
- NULL);
+ "tag-available", FALSE,
+ NULL);
TRACE("num_tracks=%i track=%i", num_tracks, track);
g_signal_emit(G_OBJECT(gst), signals[MEDIA_TAG], 0, gst->priv->stream);
@@ -1256,93 +1191,82 @@ parole_gst_get_meta_data_cdda(ParoleGst *gst, GstTagList *tag)
}
static void
-parole_gst_get_meta_data_file(ParoleGst *gst, GstTagList *tag)
-{
+parole_gst_get_meta_data_file(ParoleGst *gst, GstTagList *tag) {
gchar *str;
GDate *date;
guint integer;
GdkPixbuf *pixbuf;
- if ( gst_tag_list_get_string_index (tag, GST_TAG_TITLE, 0, &str) )
- {
+ if (gst_tag_list_get_string_index(tag, GST_TAG_TITLE, 0, &str)) {
TRACE("title:%s", str);
g_object_set(G_OBJECT(gst->priv->stream),
- "title", str,
- NULL);
+ "title", str,
+ NULL);
g_free(str);
}
- if ( gst_tag_list_get_string_index (tag, GST_TAG_ARTIST, 0, &str) )
- {
+ if (gst_tag_list_get_string_index(tag, GST_TAG_ARTIST, 0, &str)) {
TRACE("artist:%s", str);
g_object_set(G_OBJECT(gst->priv->stream),
- "artist", str,
- NULL);
+ "artist", str,
+ NULL);
g_free(str);
}
- if ( gst_tag_list_get_date (tag, GST_TAG_DATE, &date) )
- {
+ if (gst_tag_list_get_date(tag, GST_TAG_DATE, &date)) {
str = g_strdup_printf("%d", g_date_get_year(date));
TRACE("year:%s", str);
g_object_set(G_OBJECT(gst->priv->stream),
- "year", str,
- NULL);
+ "year", str,
+ NULL);
g_date_free(date);
g_free(str);
}
- if ( gst_tag_list_get_string_index (tag, GST_TAG_ALBUM, 0, &str) )
- {
+ if (gst_tag_list_get_string_index(tag, GST_TAG_ALBUM, 0, &str)) {
TRACE("album:%s", str);
g_object_set(G_OBJECT(gst->priv->stream),
- "album", str,
- NULL);
+ "album", str,
+ NULL);
g_free(str);
}
- if ( gst_tag_list_get_string_index (tag, GST_TAG_COMMENT, 0, &str) )
- {
+ if (gst_tag_list_get_string_index(tag, GST_TAG_COMMENT, 0, &str)) {
TRACE("comment:%s", str);
g_object_set(G_OBJECT(gst->priv->stream),
- "comment", str,
- NULL);
+ "comment", str,
+ NULL);
g_free(str);
}
- if ( gst_tag_list_get_string_index (tag, GST_TAG_GENRE, 0, &str) )
- {
+ if (gst_tag_list_get_string_index(tag, GST_TAG_GENRE, 0, &str)) {
TRACE("genre:%s", str);
g_object_set(G_OBJECT(gst->priv->stream),
- "genre", str,
- NULL);
+ "genre", str,
+ NULL);
g_free(str);
}
- if ( gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, &integer) )
- {
+ if (gst_tag_list_get_uint(tag, GST_TAG_TRACK_NUMBER, &integer)) {
TRACE("track:%i", integer);
- if (integer < 100)
- {
+ if (integer < 100) {
g_object_set(G_OBJECT(gst->priv->stream),
"track", integer,
NULL);
}
}
- if ( gst_tag_list_get_uint (tag, GST_TAG_BITRATE, &integer) )
- {
+ if (gst_tag_list_get_uint(tag, GST_TAG_BITRATE, &integer)) {
TRACE("bitrate:%i", integer);
g_object_set(G_OBJECT(gst->priv->stream),
- "bitrate", integer,
- NULL);
+ "bitrate", integer,
+ NULL);
}
pixbuf = parole_gst_tag_list_get_cover(gst, tag);
- if (pixbuf)
- {
+ if (pixbuf) {
parole_stream_set_image(G_OBJECT(gst->priv->stream), pixbuf);
g_object_unref(pixbuf);
}
@@ -1355,37 +1279,34 @@ parole_gst_get_meta_data_file(ParoleGst *gst, GstTagList *tag)
}
static void
-parole_gst_get_meta_data_unknown(ParoleGst *gst)
-{
+parole_gst_get_meta_data_unknown(ParoleGst *gst) {
g_object_set(G_OBJECT(gst->priv->stream),
- "title", NULL,
- "artist", NULL,
- "year", NULL,
- "album", NULL,
- "comment", NULL,
- "genre", NULL,
- NULL);
+ "title", NULL,
+ "artist", NULL,
+ "year", NULL,
+ "album", NULL,
+ "comment", NULL,
+ "genre", NULL,
+ NULL);
parole_stream_set_image(G_OBJECT(gst->priv->stream), NULL);
g_object_set(G_OBJECT(gst->priv->stream),
- "tag-available", FALSE,
- NULL);
+ "tag-available", FALSE,
+ NULL);
g_signal_emit(G_OBJECT(gst), signals[MEDIA_TAG], 0, gst->priv->stream);
}
static void
-parole_gst_get_meta_data(ParoleGst *gst, GstTagList *tag)
-{
+parole_gst_get_meta_data(ParoleGst *gst, GstTagList *tag) {
ParoleMediaType media_type;
g_object_get(G_OBJECT(gst->priv->stream),
- "media-type", &media_type,
- NULL);
+ "media-type", &media_type,
+ NULL);
- switch ( media_type )
- {
+ switch ( media_type ) {
case PAROLE_MEDIA_TYPE_LOCAL_FILE:
case PAROLE_MEDIA_TYPE_REMOTE:
parole_gst_get_meta_data_file(gst, tag);
@@ -1405,8 +1326,7 @@ parole_gst_get_meta_data(ParoleGst *gst, GstTagList *tag)
}
static void
-parole_gst_application_message(ParoleGst *gst, GstMessage *msg)
-{
+parole_gst_application_message(ParoleGst *gst, GstMessage *msg) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
#if GST_CHECK_VERSION(1, 0, 0)
if (gst_message_has_name(msg, "notify-streaminfo")) {
@@ -1441,10 +1361,8 @@ parole_gst_application_message(ParoleGst *gst, GstMessage *msg)
* the gstreamer plugin registry and restart playback.
**/
static void
-parole_gst_install_plugins_result_func(GstInstallPluginsReturn result, gpointer user_data)
-{
- switch (result)
- {
+parole_gst_install_plugins_result_func(GstInstallPluginsReturn result, gpointer user_data) {
+ switch (result) {
case GST_INSTALL_PLUGINS_SUCCESS:
g_debug("Finished plugin install.\n");
gst_update_registry();
@@ -1463,8 +1381,7 @@ parole_gst_install_plugins_result_func(GstInstallPluginsReturn result, gpointer
}
static GtkDialog*
-parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg)
-{
+parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg) {
GtkMessageDialog *dialog;
gchar* desc;
@@ -1507,8 +1424,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg)
}
static gboolean
-parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
-{
+parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data) {
ParoleGst *gst;
GtkDialog *dialog;
gchar* details[2];
@@ -1517,8 +1433,7 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
gst = PAROLE_GST(data);
- switch (GST_MESSAGE_TYPE (msg))
- {
+ switch (GST_MESSAGE_TYPE(msg)) {
case GST_MESSAGE_EOS:
{
ParoleMediaType media_type;
@@ -1565,8 +1480,7 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
{
GstState old, new, pending;
gst_message_parse_state_changed (msg, &old, &new, &pending);
- if ( GST_MESSAGE_SRC (msg) == GST_OBJECT (gst->priv->playbin) )
- {
+ if (GST_MESSAGE_SRC(msg) == GST_OBJECT(gst->priv->playbin)) {
parole_gst_evaluate_state (gst, old, new, pending);
}
break;
@@ -1574,8 +1488,7 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
case GST_MESSAGE_TAG:
{
- if ( gst->priv->enable_tags )
- {
+ if ( gst->priv->enable_tags ) {
GstTagList *tag_list;
TRACE("Tag message:");
gst_message_parse_tag(msg, &tag_list);
@@ -1588,30 +1501,25 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
parole_gst_application_message(gst, msg);
break;
case GST_MESSAGE_DURATION:
- if (gst->priv->state == GST_STATE_PLAYING)
- {
+ if (gst->priv->state == GST_STATE_PLAYING) {
TRACE("Duration message");
parole_gst_query_duration(gst);
}
break;
case GST_MESSAGE_ELEMENT:
- if (gst_is_missing_plugin_message(msg))
- {
+ if (gst_is_missing_plugin_message(msg)) {
g_debug("Missing plugin\n");
parole_gst_stop(gst);
dialog = parole_gst_missing_codec_dialog(gst, msg);
response = gtk_dialog_run(dialog);
- if ( response == GTK_RESPONSE_ACCEPT )
- {
+ if ( response == GTK_RESPONSE_ACCEPT ) {
gtk_widget_destroy(GTK_WIDGET(dialog));
details[0] = gst_missing_plugin_message_get_installer_detail(msg);
details[1] = NULL;
ctx = gst_install_plugins_context_new();
#ifdef GDK_WINDOWING_X11
- if (gtk_widget_get_window (GTK_WIDGET (gst)) != NULL &&
- gtk_widget_get_realized(GTK_WIDGET(gst)))
- {
+ if (gtk_widget_get_window (GTK_WIDGET (gst)) != NULL && gtk_widget_get_realized(GTK_WIDGET(gst))) {
gst_install_plugins_context_set_xid(ctx,
gdk_x11_window_get_xid(gtk_widget_get_window(GTK_WIDGET(gst))));
}
@@ -1638,8 +1546,7 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
TRACE("Stream status");
break;
case GST_MESSAGE_ASYNC_DONE:
- if (gst->priv->seeking)
- {
+ if (gst->priv->seeking) {
gst->priv->seeking = FALSE;
g_signal_emit(G_OBJECT(gst), signals[MEDIA_SEEKED], 0);
}
@@ -1660,16 +1567,14 @@ parole_gst_bus_event(GstBus *bus, GstMessage *msg, gpointer data)
}
static void
-parole_gst_change_state (ParoleGst *gst, GstState new)
-{
+parole_gst_change_state (ParoleGst *gst, GstState new) {
GstStateChangeReturn ret;
TRACE ("Changing state to %d", new);
ret = gst_element_set_state (GST_ELEMENT (gst->priv->playbin), new);
- switch (ret)
- {
+ switch (ret) {
case GST_STATE_CHANGE_SUCCESS:
parole_gst_evaluate_state(gst,
GST_STATE_RETURN(gst->priv->playbin),
@@ -1691,18 +1596,15 @@ parole_gst_change_state (ParoleGst *gst, GstState new)
}
static void
-parole_gst_source_notify_cb(GObject *obj, GParamSpec *pspec, ParoleGst *gst)
-{
+parole_gst_source_notify_cb(GObject *obj, GParamSpec *pspec, ParoleGst *gst) {
GObject *source;
g_object_get(obj,
"source", &source,
NULL);
- if ( source )
- {
- if ( G_LIKELY (gst->priv->device) )
- {
+ if ( source ) {
+ if (G_LIKELY(gst->priv->device)) {
g_object_set(source,
"device", gst->priv->device,
NULL);
@@ -1712,14 +1614,12 @@ parole_gst_source_notify_cb(GObject *obj, GParamSpec *pspec, ParoleGst *gst)
}
static void
-parole_gst_play_file_internal(ParoleGst *gst)
-{
+parole_gst_play_file_internal(ParoleGst *gst) {
gchar *uri;
TRACE("Start");
- if ( G_UNLIKELY (GST_STATE (gst->priv->playbin) == GST_STATE_PLAYING ) )
- {
+ if (G_UNLIKELY(GST_STATE(gst->priv->playbin) == GST_STATE_PLAYING)) {
TRACE("*** Error *** This is a bug, playbin element is already playing");
}
@@ -1745,8 +1645,7 @@ parole_gst_play_file_internal(ParoleGst *gst)
}
void
-parole_gst_send_navigation_command(ParoleGst *gst, gint command)
-{
+parole_gst_send_navigation_command(ParoleGst *gst, gint command) {
GstNavigation *nav;
nav = GST_NAVIGATION(gst->priv->video_sink);
@@ -1777,8 +1676,7 @@ parole_gst_send_navigation_command(ParoleGst *gst, gint command)
}
static gboolean
-parole_gst_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev)
-{
+parole_gst_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev) {
gboolean ret = FALSE;
if (GTK_WIDGET_CLASS (parole_gst_parent_class)->motion_notify_event)
@@ -1788,8 +1686,7 @@ parole_gst_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev)
}
static gboolean
-parole_gst_button_press_event(GtkWidget *widget, GdkEventButton *ev)
-{
+parole_gst_button_press_event(GtkWidget *widget, GdkEventButton *ev) {
ParoleGst *gst;
GstNavigation *nav;
gboolean playing_video;
@@ -1798,11 +1695,10 @@ parole_gst_button_press_event(GtkWidget *widget, GdkEventButton *ev)
gst = PAROLE_GST(widget);
g_object_get(G_OBJECT(gst->priv->stream),
- "has-video", &playing_video,
- NULL);
+ "has-video", &playing_video,
+ NULL);
- if ( gst->priv->state == GST_STATE_PLAYING && playing_video)
- {
+ if (gst->priv->state == GST_STATE_PLAYING && playing_video) {
nav = GST_NAVIGATION(gst->priv->video_sink);
gst_navigation_send_mouse_event(nav, "mouse-button-press", ev->button, ev->x, ev->y);
}
@@ -1814,8 +1710,7 @@ parole_gst_button_press_event(GtkWidget *widget, GdkEventButton *ev)
}
static gboolean
-parole_gst_button_release_event(GtkWidget *widget, GdkEventButton *ev)
-{
+parole_gst_button_release_event(GtkWidget *widget, GdkEventButton *ev) {
ParoleGst *gst;
GstNavigation *nav;
gboolean playing_video;
@@ -1827,8 +1722,7 @@ parole_gst_button_release_event(GtkWidget *widget, GdkEventButton *ev)
"has-video", &playing_video,
NULL);
- if ( gst->priv->state == GST_STATE_PLAYING && playing_video)
- {
+ if (gst->priv->state == GST_STATE_PLAYING && playing_video) {
nav = GST_NAVIGATION(gst->priv->video_sink);
gst_navigation_send_mouse_event(nav, "mouse-button-release", ev->button, ev->x, ev->y);
}
@@ -1840,8 +1734,7 @@ parole_gst_button_release_event(GtkWidget *widget, GdkEventButton *ev)
}
static void
-parole_gst_seek_by_format(ParoleGst *gst, GstFormat format, gint step)
-{
+parole_gst_seek_by_format(ParoleGst *gst, GstFormat format, gint step) {
gint64 val = 1;
#if GST_CHECK_VERSION(1, 0, 0)
@@ -1854,8 +1747,7 @@ parole_gst_seek_by_format(ParoleGst *gst, GstFormat format, gint step)
GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET,
val,
GST_SEEK_TYPE_NONE,
- 0) )
- {
+ 0) ) {
g_warning("Seek failed : %s", gst_format_get_name(format));
}
} else {
@@ -1864,23 +1756,20 @@ parole_gst_seek_by_format(ParoleGst *gst, GstFormat format, gint step)
}
static void
-parole_gst_change_dvd_chapter(ParoleGst *gst, gint level)
-{
+parole_gst_change_dvd_chapter(ParoleGst *gst, gint level) {
GstFormat format = gst_format_get_by_nick("chapter");
parole_gst_seek_by_format(gst, format, level);
}
static void
-parole_gst_change_cdda_track(ParoleGst *gst, gint level)
-{
+parole_gst_change_cdda_track(ParoleGst *gst, gint level) {
GstFormat format = gst_format_get_by_nick("track");
parole_gst_seek_by_format(gst, format, level);
}
-ParoleMediaType parole_gst_get_current_stream_type(ParoleGst *gst)
-{
+ParoleMediaType parole_gst_get_current_stream_type(ParoleGst *gst) {
ParoleMediaType type;
g_object_get(G_OBJECT(gst->priv->stream),
"media-type", &type,
@@ -1889,8 +1778,7 @@ ParoleMediaType parole_gst_get_current_stream_type(ParoleGst *gst)
}
static gboolean
-parole_gst_check_state_change_timeout(gpointer data)
-{
+parole_gst_check_state_change_timeout(gpointer data) {
ParoleGst *gst;
GtkWidget *dialog;
@@ -1899,8 +1787,7 @@ parole_gst_check_state_change_timeout(gpointer data)
TRACE("target =%d current state=%d", gst->priv->target, gst->priv->state);
g_print("check state\n");
- if ( gst->priv->state != gst->priv->target )
- {
+ if ( gst->priv->state != gst->priv->target ) {
dialog = gtk_message_dialog_new(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(gst))),
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
@@ -1909,8 +1796,7 @@ parole_gst_check_state_change_timeout(gpointer data)
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), _("Do you want to continue loading or stop?"));
gtk_dialog_add_button(GTK_DIALOG(dialog), _("Stop"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(dialog), _("Continue"), GTK_RESPONSE_CLOSE);
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_CANCEL)
- {
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_CANCEL) {
parole_gst_terminate_internal(gst);
gst->priv->state_change_id = 0;
return FALSE;
@@ -1920,8 +1806,7 @@ parole_gst_check_state_change_timeout(gpointer data)
}
static void
-parole_gst_terminate_internal(ParoleGst *gst)
-{
+parole_gst_terminate_internal(ParoleGst *gst) {
gboolean playing_video;
g_object_get(G_OBJECT(gst->priv->stream),
@@ -1939,8 +1824,7 @@ parole_gst_terminate_internal(ParoleGst *gst)
}
static void
-parole_gst_about_to_finish_cb(GstElement *elm, gpointer data)
-{
+parole_gst_about_to_finish_cb(GstElement *elm, gpointer data) {
ParoleGst *gst;
gst = PAROLE_GST(data);
@@ -1950,8 +1834,7 @@ parole_gst_about_to_finish_cb(GstElement *elm, gpointer data)
}
static void
-parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst)
-{
+parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
if ( !g_strcmp0("vis-enabled", spec->name) || !g_strcmp0("vis-name", spec->name) ) {
gst->priv->update_vis = TRUE;
@@ -1959,9 +1842,7 @@ parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst)
parole_gst_set_subtitle_font(gst);
} else if (!g_strcmp0("subtitle-encoding", spec->name)) {
parole_gst_set_subtitle_encoding(gst);
- } else if (!g_strcmp0 ("brightness", spec->name) || !g_strcmp0 ("hue", spec->name) ||
- !g_strcmp0("contrast", spec->name) || !g_strcmp0("saturation", spec->name))
- {
+ } else if (!g_strcmp0 ("brightness", spec->name) || !g_strcmp0 ("hue", spec->name) || !g_strcmp0("contrast", spec->name) || !g_strcmp0("saturation", spec->name)) {
gst->priv->update_color_balance = TRUE;
if ( gst->priv->state >= GST_STATE_PAUSED )
@@ -1978,8 +1859,7 @@ parole_gst_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleGst *gst)
}
static void
-parole_gst_conf_notify_volume_cb(GObject *conf, GParamSpec *pspec, ParoleGst *gst)
-{
+parole_gst_conf_notify_volume_cb(GObject *conf, GParamSpec *pspec, ParoleGst *gst) {
gint volume;
g_object_get(G_OBJECT(gst->priv->conf),
@@ -1992,13 +1872,11 @@ parole_gst_conf_notify_volume_cb(GObject *conf, GParamSpec *pspec, ParoleGst *gs
static void parole_gst_get_property(GObject *object,
guint prop_id,
GValue *value,
- GParamSpec *pspec)
-{
+ GParamSpec *pspec) {
ParoleGst *gst;
gst = PAROLE_GST(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_VOLUME:
g_value_set_double(value, gst->priv->volume);
break;
@@ -2018,13 +1896,11 @@ static void parole_gst_get_property(GObject *object,
static void parole_gst_set_property(GObject *object,
guint prop_id,
const GValue *value,
- GParamSpec *pspec)
-{
+ GParamSpec *pspec) {
ParoleGst *gst;
gst = PAROLE_GST(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_ENABLE_TAGS:
gst->priv->enable_tags = g_value_get_boolean(value);
break;
@@ -2034,8 +1910,7 @@ static void parole_gst_set_property(GObject *object,
case PROP_CONF_OBJ:
gst->priv->conf = g_value_get_pointer(value);
- if (gst->priv->conf)
- {
+ if (gst->priv->conf) {
g_object_get(G_OBJECT(gst->priv->conf),
"aspect-ratio", &gst->priv->aspect_ratio,
NULL);
@@ -2054,8 +1929,7 @@ static void parole_gst_set_property(GObject *object,
static gboolean
-parole_notify_volume_idle_cb(ParoleGst *gst)
-{
+parole_notify_volume_idle_cb(ParoleGst *gst) {
gdouble vol;
vol = gst_stream_volume_get_volume(GST_STREAM_VOLUME(gst->priv->playbin),
@@ -2070,14 +1944,12 @@ parole_notify_volume_idle_cb(ParoleGst *gst)
static void
parole_notify_volume_cb(GObject *object,
GParamSpec *pspec,
- ParoleGst *gst)
-{
+ ParoleGst *gst) {
g_idle_add((GSourceFunc) parole_notify_volume_idle_cb, gst);
}
static void
-parole_gst_show_error(GtkWindow *window, GError *error)
-{
+parole_gst_show_error(GtkWindow *window, GError *error) {
GtkWidget *dialog;
gchar *message;
dialog = gtk_message_dialog_new(NULL,
@@ -2091,8 +1963,7 @@ parole_gst_show_error(GtkWindow *window, GError *error)
}
static void
-parole_gst_constructed(GObject *object)
-{
+parole_gst_constructed(GObject *object) {
ParoleGst *gst;
gchar *videosink = NULL;
@@ -2112,8 +1983,7 @@ parole_gst_constructed(GObject *object)
/* Configure the playbin */
gst->priv->playbin = gst_element_factory_make(playbin, "player");
- if ( G_UNLIKELY (gst->priv->playbin == NULL) )
- {
+ if (G_UNLIKELY(gst->priv->playbin == NULL)) {
GError *error;
error = g_error_new(1, 0, _("Unable to load \"%s\" plugin"
@@ -2129,8 +1999,7 @@ parole_gst_constructed(GObject *object)
/* Configure the audio sink */
gst->priv->audio_sink = gst_element_factory_make("autoaudiosink", "audio");
- if ( G_UNLIKELY (gst->priv->audio_sink == NULL) )
- {
+ if (G_UNLIKELY(gst->priv->audio_sink == NULL)) {
GError *error;
error = g_error_new(1, 0, _("Unable to load \"%s\" plugin"
", check your GStreamer installation."), "autoaudiosink");
@@ -2141,28 +2010,24 @@ parole_gst_constructed(GObject *object)
}
/* Configure the video sink */
- if (g_strcmp0(videosink, "xvimagesink") == 0)
- {
+ if (g_strcmp0(videosink, "xvimagesink") == 0) {
gst->priv->image_sink = XVIMAGESINK;
gst->priv->video_sink = gst_element_factory_make("xvimagesink", "video");
}
#ifdef HAVE_CLUTTER
- if (g_strcmp0(videosink, "cluttersink") == 0)
- {
+ if (g_strcmp0(videosink, "cluttersink") == 0) {
gst->priv->image_sink = CLUTTERSINK;
gst->priv->video_sink = gst_element_factory_make("cluttersink", "video");
}
#endif
- if ( G_UNLIKELY (gst->priv->video_sink == NULL) )
- {
+ if (G_UNLIKELY(gst->priv->video_sink == NULL)) {
gst->priv->image_sink = XIMAGESINK;
g_debug("%s trying to load ximagesink", g_strcmp0(videosink, "xvimagesink") ? "xvimagesink not found " : "xv disabled ");
gst->priv->video_sink = gst_element_factory_make("ximagesink", "video");
- if ( G_UNLIKELY (gst->priv->video_sink == NULL) )
- {
+ if (G_UNLIKELY(gst->priv->video_sink == NULL)) {
GError *error;
error = g_error_new(1, 0, _("Unable to load \"%s\" plugin"
", check your GStreamer installation."),
@@ -2220,8 +2085,7 @@ parole_gst_constructed(GObject *object)
}
static void
-parole_gst_class_init(ParoleGstClass *klass)
-{
+parole_gst_class_init(ParoleGstClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
@@ -2340,8 +2204,7 @@ parole_gst_class_init(ParoleGstClass *klass)
}
static void
-parole_gst_init(ParoleGst *gst)
-{
+parole_gst_init(ParoleGst *gst) {
gst->priv = PAROLE_GST_GET_PRIVATE(gst);
gst->priv->state = GST_STATE_VOID_PENDING;
@@ -2379,8 +2242,7 @@ parole_gst_init(ParoleGst *gst)
}
GtkWidget *
-parole_gst_new(gpointer conf_obj)
-{
+parole_gst_new(gpointer conf_obj) {
parole_gst_object = g_object_new(PAROLE_TYPE_GST,
"conf-object", conf_obj,
NULL);
@@ -2390,8 +2252,7 @@ parole_gst_new(gpointer conf_obj)
return GTK_WIDGET (parole_gst_object);
}
-GtkWidget *parole_gst_get(void)
-{
+GtkWidget *parole_gst_get(void) {
if ( G_LIKELY(parole_gst_object != NULL ) ) {
/*
* Don't increase the reference count of this object as
@@ -2408,8 +2269,7 @@ GtkWidget *parole_gst_get(void)
}
static gboolean
-parole_gst_play_idle(gpointer data)
-{
+parole_gst_play_idle(gpointer data) {
ParoleGst *gst;
gst = PAROLE_GST(data);
@@ -2422,8 +2282,7 @@ parole_gst_play_idle(gpointer data)
return FALSE;
}
-void parole_gst_set_custom_subtitles(ParoleGst *gst, const gchar* sub_file)
-{
+void parole_gst_set_custom_subtitles(ParoleGst *gst, const gchar* sub_file) {
if ( sub_file == NULL ) {
gst->priv->use_custom_subtitles = FALSE;
gst->priv->custom_subtitles = NULL;
@@ -2433,28 +2292,26 @@ void parole_gst_set_custom_subtitles(ParoleGst *gst, const gchar* sub_file)
}
}
-gchar * parole_gst_get_file_uri(ParoleGst *gst)
-{
+gchar * parole_gst_get_file_uri(ParoleGst *gst) {
gchar* uri;
g_object_get(G_OBJECT(gst->priv->stream),
- "uri", &uri,
- NULL);
+ "uri", &uri,
+ NULL);
return uri;
}
-void parole_gst_play_uri(ParoleGst *gst, const gchar *uri, const gchar *subtitles)
-{
+void parole_gst_play_uri(ParoleGst *gst, const gchar *uri, const gchar *subtitles) {
g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_PLAYING;
parole_stream_init_properties(gst->priv->stream);
g_object_set(G_OBJECT(gst->priv->stream),
- "uri", uri,
- "subtitles", subtitles,
- NULL);
+ "uri", uri,
+ "subtitles", subtitles,
+ NULL);
g_mutex_unlock(&gst->priv->lock);
@@ -2470,14 +2327,12 @@ void parole_gst_play_uri(ParoleGst *gst, const gchar *uri, const gchar *subtitle
gst->priv->device = NULL;
}
-void parole_gst_play_device_uri(ParoleGst *gst, const gchar *uri, const gchar *device)
-{
+void parole_gst_play_device_uri(ParoleGst *gst, const gchar *uri, const gchar *device) {
const gchar *local_uri = NULL;
TRACE("device : %s", device);
- if ( gst->priv->device )
- {
+ if ( gst->priv->device ) {
g_free(gst->priv->device);
gst->priv->device = NULL;
}
@@ -2503,8 +2358,7 @@ void parole_gst_play_device_uri(ParoleGst *gst, const gchar *uri, const gchar *d
parole_gst_play_uri(gst, local_uri, NULL);
}
-void parole_gst_pause(ParoleGst *gst)
-{
+void parole_gst_pause(ParoleGst *gst) {
g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_PAUSED;
@@ -2515,8 +2369,7 @@ void parole_gst_pause(ParoleGst *gst)
parole_gst_change_state(gst, GST_STATE_PAUSED);
}
-void parole_gst_resume(ParoleGst *gst)
-{
+void parole_gst_resume(ParoleGst *gst) {
g_mutex_lock(&gst->priv->lock);
gst->priv->target = GST_STATE_PLAYING;
@@ -2528,8 +2381,7 @@ void parole_gst_resume(ParoleGst *gst)
}
static gboolean
-parole_gst_stop_idle(gpointer data)
-{
+parole_gst_stop_idle(gpointer data) {
ParoleGst *gst;
gst = PAROLE_GST(data);
@@ -2539,8 +2391,7 @@ parole_gst_stop_idle(gpointer data)
return FALSE;
}
-void parole_gst_stop(ParoleGst *gst)
-{
+void parole_gst_stop(ParoleGst *gst) {
g_mutex_lock(&gst->priv->lock);
parole_stream_init_properties(gst->priv->stream);
@@ -2553,14 +2404,12 @@ void parole_gst_stop(ParoleGst *gst)
g_idle_add((GSourceFunc) parole_gst_stop_idle, gst);
}
-void parole_gst_terminate(ParoleGst *gst)
-{
+void parole_gst_terminate(ParoleGst *gst) {
gst->priv->terminating = TRUE;
parole_gst_terminate_internal(gst);
}
-void parole_gst_shutdown(ParoleGst *gst)
-{
+void parole_gst_shutdown(ParoleGst *gst) {
/**
* FIXME: See https://bugzilla.xfce.org/show_bug.cgi?id=12169
* Seems to be some last-second threading issues. When parole is closed,
@@ -2584,8 +2433,7 @@ void parole_gst_shutdown(ParoleGst *gst)
g_object_unref(gst->priv->playbin);
}
-void parole_gst_seek(ParoleGst *gst, gdouble seek)
-{
+void parole_gst_seek(ParoleGst *gst, gdouble seek) {
TRACE("Seeking");
g_warn_if_fail(gst_element_seek(gst->priv->playbin,
1.0,
@@ -2597,11 +2445,9 @@ void parole_gst_seek(ParoleGst *gst, gdouble seek)
gst->priv->seeking = TRUE;
}
-void parole_gst_set_volume(ParoleGst *gst, gdouble volume)
-{
+void parole_gst_set_volume(ParoleGst *gst, gdouble volume) {
volume = CLAMP(volume, 0.0, 1.0);
- if (gst->priv->volume != volume)
- {
+ if (gst->priv->volume != volume) {
gst_stream_volume_set_volume(GST_STREAM_VOLUME(gst->priv->playbin),
GST_STREAM_VOLUME_FORMAT_CUBIC,
volume);
@@ -2612,38 +2458,31 @@ void parole_gst_set_volume(ParoleGst *gst, gdouble volume)
}
}
-gdouble parole_gst_get_volume(ParoleGst *gst)
-{
+gdouble parole_gst_get_volume(ParoleGst *gst) {
return gst->priv->volume;
}
-ParoleState parole_gst_get_state(ParoleGst *gst)
-{
+ParoleState parole_gst_get_state(ParoleGst *gst) {
return gst->priv->media_state;
}
-GstState parole_gst_get_gst_state(ParoleGst *gst)
-{
+GstState parole_gst_get_gst_state(ParoleGst *gst) {
return gst->priv->state;
}
-GstState parole_gst_get_gst_target_state(ParoleGst *gst)
-{
+GstState parole_gst_get_gst_target_state(ParoleGst *gst) {
return gst->priv->target;
}
-void parole_gst_next_dvd_chapter(ParoleGst *gst)
-{
+void parole_gst_next_dvd_chapter(ParoleGst *gst) {
parole_gst_change_dvd_chapter(gst, 1);
}
-void parole_gst_prev_dvd_chapter(ParoleGst *gst)
-{
+void parole_gst_prev_dvd_chapter(ParoleGst *gst) {
parole_gst_change_dvd_chapter(gst, -1);
}
-void parole_gst_set_dvd_chapter(ParoleGst *gst, gint chapter)
-{
+void parole_gst_set_dvd_chapter(ParoleGst *gst, gint chapter) {
GstFormat format = gst_format_get_by_nick("chapter");
guint64 val = (guint64) chapter;
@@ -2654,8 +2493,7 @@ void parole_gst_set_dvd_chapter(ParoleGst *gst, gint chapter)
0);
}
-gint parole_gst_get_num_tracks(ParoleGst *gst)
-{
+gint parole_gst_get_num_tracks(ParoleGst *gst) {
gint num_tracks;
g_object_get(G_OBJECT(gst->priv->stream),
@@ -2665,8 +2503,7 @@ gint parole_gst_get_num_tracks(ParoleGst *gst)
return num_tracks;
}
-void parole_gst_seek_cdda(ParoleGst *gst, guint track_num)
-{
+void parole_gst_seek_cdda(ParoleGst *gst, guint track_num) {
gint current_track;
current_track = parole_gst_get_current_cdda_track(gst);
@@ -2674,8 +2511,7 @@ void parole_gst_seek_cdda(ParoleGst *gst, guint track_num)
parole_gst_change_cdda_track(gst, (gint)track_num - current_track - 1);
}
-gint parole_gst_get_current_cdda_track(ParoleGst *gst)
-{
+gint parole_gst_get_current_cdda_track(ParoleGst *gst) {
GstFormat format = gst_format_get_by_nick("track");
gint64 pos;
gint ret_val = 1;
@@ -2692,8 +2528,7 @@ gint parole_gst_get_current_cdda_track(ParoleGst *gst)
return ret_val;
}
-gint64 parole_gst_get_stream_duration(ParoleGst *gst)
-{
+gint64 parole_gst_get_stream_duration(ParoleGst *gst) {
gint64 dur;
g_object_get(G_OBJECT(gst->priv->stream),
@@ -2702,8 +2537,7 @@ gint64 parole_gst_get_stream_duration(ParoleGst *gst)
return dur;
}
-gint64 parole_gst_get_stream_position(ParoleGst *gst)
-{
+gint64 parole_gst_get_stream_position(ParoleGst *gst) {
GstFormat format = GST_FORMAT_TIME;
gint64 pos;
@@ -2716,14 +2550,12 @@ gint64 parole_gst_get_stream_position(ParoleGst *gst)
return pos / GST_SECOND;
}
-gboolean parole_gst_get_is_xvimage_sink(ParoleGst *gst)
-{
+gboolean parole_gst_get_is_xvimage_sink(ParoleGst *gst) {
return gst->priv->image_sink == XVIMAGESINK;
}
void
-parole_gst_set_cursor_visible(ParoleGst *gst, gboolean visible)
-{
+parole_gst_set_cursor_visible(ParoleGst *gst, gboolean visible) {
if ( visible ) {
if (gst->priv->target == gst->priv->state)
parole_window_normal_cursor(gtk_widget_get_window(GTK_WIDGET(gst)));
@@ -2735,8 +2567,7 @@ parole_gst_set_cursor_visible(ParoleGst *gst, gboolean visible)
}
GList *
-gst_get_lang_list_for_type(ParoleGst * gst, const gchar * type_name)
-{
+gst_get_lang_list_for_type(ParoleGst * gst, const gchar * type_name) {
GList *ret = NULL;
gint num = 1;
@@ -2803,8 +2634,7 @@ gst_get_lang_list_for_type(ParoleGst * gst, const gchar * type_name)
if (lc) {
language_name = g_strdup(gst_tag_get_language_name(lc));
- if (language_name)
- {
+ if (language_name) {
ret = g_list_prepend(ret, language_name);
} else {
ret = g_list_prepend(ret, lc);
@@ -2820,8 +2650,7 @@ gst_get_lang_list_for_type(ParoleGst * gst, const gchar * type_name)
}
}
- if ( gst->priv->use_custom_subtitles == TRUE )
- {
+ if ( gst->priv->use_custom_subtitles == TRUE ) {
ret = g_list_append(ret, g_strdup_printf("%s", gst->priv->custom_subtitles));
}
} else {
@@ -2833,8 +2662,7 @@ gst_get_lang_list_for_type(ParoleGst * gst, const gchar * type_name)
}
gboolean
-gst_get_has_vis(ParoleGst *gst)
-{
+gst_get_has_vis(ParoleGst *gst) {
gboolean has_vis;
g_object_get(G_OBJECT(gst->priv->conf),
@@ -2845,8 +2673,7 @@ gst_get_has_vis(ParoleGst *gst)
}
gboolean
-gst_get_has_video(ParoleGst *gst)
-{
+gst_get_has_video(ParoleGst *gst) {
gboolean playing_video;
g_object_get(G_OBJECT(gst->priv->stream),
@@ -2857,14 +2684,12 @@ gst_get_has_video(ParoleGst *gst)
}
void
-gst_set_current_audio_track(ParoleGst *gst, gint track_no)
-{
+gst_set_current_audio_track(ParoleGst *gst, gint track_no) {
g_object_set(G_OBJECT(gst->priv->playbin), "current-audio", track_no, NULL);
}
void
-gst_set_current_subtitle_track(ParoleGst *gst, gint track_no)
-{
+gst_set_current_subtitle_track(ParoleGst *gst, gint track_no) {
gchar *uri, *sub;
gint flags;
@@ -2900,15 +2725,13 @@ gst_set_current_subtitle_track(ParoleGst *gst, gint track_no)
parole_gst_load_subtitle(gst);
}
-const ParoleStream *parole_gst_get_stream(ParoleGst *gst)
-{
+const ParoleStream *parole_gst_get_stream(ParoleGst *gst) {
g_return_val_if_fail(PAROLE_IS_GST(gst), NULL);
return gst->priv->stream;
}
-GstElement *parole_gst_video_sink(ParoleGst *gst)
-{
+GstElement *parole_gst_video_sink(ParoleGst *gst) {
GstElement *video_sink;
g_object_get(G_OBJECT(gst->priv->playbin),
"video-sink", &video_sink,
diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h
index 21890f5..996825e 100644
--- a/src/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -36,8 +36,7 @@ G_BEGIN_DECLS
#define PAROLE_GST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_GST, ParoleGst))
#define PAROLE_IS_GST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_GST))
-typedef enum
-{
+typedef enum {
PAROLE_ASPECT_RATIO_NONE,
PAROLE_ASPECT_RATIO_AUTO,
PAROLE_ASPECT_RATIO_SQUARE,
@@ -46,8 +45,7 @@ typedef enum
PAROLE_ASPECT_RATIO_DVB
} ParoleAspectRatio;
-enum
-{
+enum {
GST_DVD_ROOT_MENU,
GST_DVD_TITLE_MENU,
GST_DVD_AUDIO_MENU,
@@ -57,14 +55,12 @@ enum
typedef struct ParoleGstPrivate ParoleGstPrivate;
-typedef struct
-{
+typedef struct {
GtkWidget parent;
ParoleGstPrivate *priv;
} ParoleGst;
-typedef struct
-{
+typedef struct {
GtkWidgetClass parent_class;
void (*media_state) (ParoleGst *gst,
diff --git a/src/main.c b/src/main.c
index 8cf940d..ce367d9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,8 +54,7 @@
#include "parole-conf.h"
static void G_GNUC_NORETURN
-show_version(void)
-{
+show_version(void) {
g_print(_("\n"
"Parole Media Player %s\n\n"
"Part of the Xfce Goodies Project\n"
@@ -66,8 +65,7 @@ show_version(void)
}
static void
-parole_sig_handler(gint sig, gpointer data)
-{
+parole_sig_handler(gint sig, gpointer data) {
ParolePlayer *player = (ParolePlayer *) data;
parole_player_terminate(player);
@@ -81,8 +79,7 @@ parole_sig_handler(gint sig, gpointer data)
* Load the discs that is passed as a cli argument to Parole.
**/
static void
-parole_send_play_disc(const gchar *uri, const gchar *device)
-{
+parole_send_play_disc(const gchar *uri, const gchar *device) {
DBusGProxy *proxy;
GError *error = NULL;
gchar *uri_local;
@@ -103,8 +100,7 @@ parole_send_play_disc(const gchar *uri, const gchar *device)
g_free(uri_local);
- if ( error )
- {
+ if ( error ) {
g_critical("Unable to send uri to Parole: %s", error->message);
g_error_free(error);
}
@@ -121,8 +117,7 @@ parole_send_play_disc(const gchar *uri, const gchar *device)
* Load files that are passed as cli arguments to Parole.
**/
static void
-parole_send_files(gchar **filenames, gboolean enqueue)
-{
+parole_send_files(gchar **filenames, gboolean enqueue) {
DBusGProxy *proxy;
GFile *file;
gchar **out_paths;
@@ -136,8 +131,7 @@ parole_send_files(gchar **filenames, gboolean enqueue)
out_paths = g_new0(gchar *, g_strv_length(filenames) + 1);
- for ( i = 0; filenames && filenames[i]; i++)
- {
+ for (i = 0; filenames && filenames[i]; i++) {
file = g_file_new_for_commandline_arg(filenames[i]);
out_paths[i] = g_file_get_path(file);
g_object_unref(file);
@@ -150,8 +144,7 @@ parole_send_files(gchar **filenames, gboolean enqueue)
G_TYPE_INVALID);
- if ( error )
- {
+ if ( error ) {
g_critical("Unable to send media files to Parole: %s", error->message);
g_error_free(error);
}
@@ -170,8 +163,7 @@ parole_send_files(gchar **filenames, gboolean enqueue)
* Load the files or device that are passed as cli arguments to Parole.
**/
static void
-parole_send(gchar **filenames, gchar *device, gboolean enqueue)
-{
+parole_send(gchar **filenames, gchar *device, gboolean enqueue) {
if ( g_strv_length (filenames) == 1 && parole_is_uri_disc (filenames[0]))
parole_send_play_disc(filenames[0], device);
else
@@ -185,8 +177,7 @@ parole_send(gchar **filenames, gchar *device, gboolean enqueue)
* Send a message via DBUS to Parole.
**/
static void
-parole_send_message(const gchar *message)
-{
+parole_send_message(const gchar *message) {
DBusGProxy *proxy;
GError *error = NULL;
@@ -196,8 +187,7 @@ parole_send_message(const gchar *message)
G_TYPE_INVALID,
G_TYPE_INVALID);
- if ( error )
- {
+ if ( error ) {
g_critical("Failed to send message : %s : %s", message, error->message);
g_error_free(error);
}
@@ -205,8 +195,7 @@ parole_send_message(const gchar *message)
g_object_unref(proxy);
}
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
ParolePlayer *player;
ParolePluginsManager *plugins;
GtkBuilder *builder;
@@ -232,24 +221,23 @@ int main(int argc, char **argv)
gchar *client_id = NULL;
/* Command-line options */
- GOptionEntry option_entries[] =
- {
- { "new-instance", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &new_instance, N_("Open a new instance"), NULL },
- { "no-plugins", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_plugins, N_("Do not load plugins"), NULL },
- { "device", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &device, N_("Set Audio-CD/VCD/DVD device path"), NULL },
- { "embedded", 'E', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &embedded, N_("Start in embedded mode"), NULL },
- { "fullscreen", 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &fullscreen, N_("Start in fullscreen mode"), NULL },
- { "play", 'p', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &play, N_("Play or pause if already playing"), NULL },
- { "next", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &next_track, N_("Next track"), NULL },
- { "previous", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &prev_track, N_("Previous track"), NULL },
- { "volume-up", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &raise_volume, N_("Raise volume"), NULL },
- { "volume-down", 'l', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &lower_volume, N_("Lower volume"), NULL },
- { "mute", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &mute, N_("Mute volume"), NULL },
- { "unmute", 'u', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &unmute, N_("Unmute (restore) volume"), NULL },
- { "add", 'a', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &enqueue, N_("Add files to playlist"), NULL},
- { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Print version information and exit"), NULL },
- { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &client_id, NULL, NULL },
- {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, N_("Media to play"), NULL},
+ GOptionEntry option_entries[] = {
+ { "new-instance", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &new_instance, N_("Open a new instance"), NULL },
+ { "no-plugins", 'n', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &no_plugins, N_("Do not load plugins"), NULL },
+ { "device", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING, &device, N_("Set Audio-CD/VCD/DVD device path"), NULL },
+ { "embedded", 'E', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &embedded, N_("Start in embedded mode"), NULL },
+ { "fullscreen", 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &fullscreen, N_("Start in fullscreen mode"), NULL },
+ { "play", 'p', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &play, N_("Play or pause if already playing"), NULL },
+ { "next", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &next_track, N_("Next track"), NULL },
+ { "previous", 'P', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &prev_track, N_("Previous track"), NULL },
+ { "volume-up", 'r', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &raise_volume, N_("Raise volume"), NULL },
+ { "volume-down", 'l', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &lower_volume, N_("Lower volume"), NULL },
+ { "mute", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &mute, N_("Mute volume"), NULL },
+ { "unmute", 'u', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &unmute, N_("Unmute (restore) volume"), NULL },
+ { "add", 'a', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &enqueue, N_("Add files to playlist"), NULL},
+ { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Print version information and exit"), NULL },
+ { "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &client_id, NULL, NULL },
+ {G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, N_("Media to play"), NULL},
{ NULL, },
};
@@ -257,8 +245,7 @@ int main(int argc, char **argv)
dbus_threads_init_default();
/* initialize xfconf */
- if (!xfconf_init (&error))
- {
+ if (!xfconf_init(&error)) {
g_critical("Failed to initialize Xfconf: %s", error->message);
g_error_free(error);
return EXIT_FAILURE;
@@ -281,8 +268,7 @@ int main(int argc, char **argv)
g_option_context_add_group(ctx, gtk_get_option_group(TRUE));
- if ( !g_option_context_parse (ctx, &argc, &argv, &error) )
- {
+ if (!g_option_context_parse(ctx, &argc, &argv, &error)) {
g_print("%s\n", error->message);
g_print(_("Type %s --help to list all available command line options\n"), argv[0]);
g_error_free(error);
@@ -295,8 +281,7 @@ int main(int argc, char **argv)
show_version();
/* Check for cli options if there is an instance of Parole already */
- if ( !new_instance && parole_dbus_name_has_owner (PAROLE_DBUS_NAME) )
- {
+ if (!new_instance && parole_dbus_name_has_owner(PAROLE_DBUS_NAME)) {
/* Clear startup notification */
gdk_notify_startup_complete();
diff --git a/src/misc/parole-debug.c b/src/misc/parole-debug.c
index cac61a5..3f0d321 100644
--- a/src/misc/parole-debug.c
+++ b/src/misc/parole-debug.c
@@ -36,8 +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, };
@@ -54,8 +53,7 @@ void parole_debug_enum(const gchar *func, const gchar *file, gint line,
}
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;
diff --git a/src/misc/parole-file.c b/src/misc/parole-file.c
index 05d78c8..709466e 100644
--- a/src/misc/parole-file.c
+++ b/src/misc/parole-file.c
@@ -42,8 +42,7 @@
typedef struct _ParoleFilePrivate ParoleFilePrivate;
-struct _ParoleFilePrivate
-{
+struct _ParoleFilePrivate {
gchar *filename;
gchar *display_name;
gchar *uri;
@@ -53,8 +52,7 @@ struct _ParoleFilePrivate
gint dvd_chapter;
};
-enum
-{
+enum {
PROP_0,
PROP_PATH,
PROP_DISPLAY_NAME,
@@ -68,8 +66,7 @@ enum
G_DEFINE_TYPE(ParoleFile, parole_file, G_TYPE_OBJECT)
static void
-parole_file_finalize(GObject *object)
-{
+parole_file_finalize(GObject *object) {
ParoleFile *file;
ParoleFilePrivate *priv;
@@ -98,14 +95,11 @@ parole_file_finalize(GObject *object)
}
static void
-parole_file_set_property(GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
-{
+parole_file_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) {
ParoleFile *file;
file = PAROLE_FILE(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_PATH:
PAROLE_FILE_GET_PRIVATE(file)->filename = g_value_dup_string(value);
break;
@@ -128,15 +122,12 @@ parole_file_set_property(GObject *object, guint prop_id,
}
static void
-parole_file_get_property(GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
+parole_file_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) {
ParoleFile *file;
file = PAROLE_FILE(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_PATH:
g_value_set_string(value, PAROLE_FILE_GET_PRIVATE(file)->filename);
break;
@@ -165,8 +156,7 @@ parole_file_get_property(GObject *object, guint prop_id,
}
static void
-parole_file_constructed(GObject *object)
-{
+parole_file_constructed(GObject *object) {
GFile *gfile;
GFileInfo *info;
ParoleFile *file;
@@ -180,8 +170,7 @@ parole_file_constructed(GObject *object)
filename = g_strdup(priv->filename);
- if ( g_str_has_prefix(filename, "cdda") )
- {
+ if ( g_str_has_prefix(filename, "cdda") ) {
priv->directory = NULL;
priv->uri = g_strdup(filename);
priv->content_type = g_strdup("cdda");
@@ -189,8 +178,7 @@ parole_file_constructed(GObject *object)
return;
}
- if ( g_str_has_prefix(filename, "dvd") )
- {
+ if ( g_str_has_prefix(filename, "dvd") ) {
priv->directory = NULL;
priv->uri = g_strdup("dvd:/");
priv->content_type = g_strdup("dvd");
@@ -203,16 +191,15 @@ parole_file_constructed(GObject *object)
gfile = g_file_new_for_commandline_arg(priv->filename);
info = g_file_query_info(gfile,
- "standard::*,",
- 0,
- NULL,
- &error);
+ "standard::*,",
+ 0,
+ NULL,
+ &error);
priv->directory = g_file_get_path(g_file_get_parent(gfile));
- if ( error )
- {
+ if ( error ) {
if (G_LIKELY(error->code == G_IO_ERROR_NOT_SUPPORTED)) {
g_error_free(error);
if (!priv->display_name)
@@ -225,8 +212,7 @@ parole_file_constructed(GObject *object)
goto out;
}
#ifdef HAVE_TAGLIBC
- else
- {
+ if (!error) {
TagLib_File *tag_file;
TagLib_Tag *tag;
gchar *title;
@@ -234,18 +220,14 @@ parole_file_constructed(GObject *object)
tag_file = taglib_file_new(priv->filename);
- if ( tag_file )
- {
+ if ( tag_file ) {
tag = taglib_file_tag(tag_file);
- if ( tag )
- {
+ if ( tag ) {
title = taglib_tag_title(tag);
- if ( title )
- {
+ if ( title ) {
title_s = g_strstrip(title);
- if ( strlen (title_s ) )
- {
+ if ( strlen(title_s) ) {
priv->display_name = g_strdup(title_s);
}
}
@@ -270,8 +252,7 @@ out:
}
static void
-parole_file_class_init(ParoleFileClass *klass)
-{
+parole_file_class_init(ParoleFileClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_file_finalize;
@@ -288,13 +269,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:
@@ -304,13 +285,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:
@@ -320,12 +301,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:
@@ -335,12 +316,12 @@ 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:
@@ -350,13 +331,13 @@ 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:
@@ -366,13 +347,13 @@ 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:
@@ -382,22 +363,21 @@ 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));
}
static void
-parole_file_init(ParoleFile *file)
-{
+parole_file_init(ParoleFile *file) {
ParoleFilePrivate *priv;
priv = PAROLE_FILE_GET_PRIVATE(file);
@@ -422,8 +402,7 @@ parole_file_init(ParoleFile *file)
* Since: 0.2
**/
ParoleFile *
-parole_file_new(const gchar *filename)
-{
+parole_file_new(const gchar *filename) {
ParoleFile *file = NULL;
file = g_object_new(PAROLE_TYPE_FILE, "filename", filename, NULL);
return file;
@@ -440,8 +419,7 @@ parole_file_new(const gchar *filename)
* Since: 0.2
**/
ParoleFile *
-parole_file_new_with_display_name(const gchar *filename, const gchar *display_name)
-{
+parole_file_new_with_display_name(const gchar *filename, const gchar *display_name) {
ParoleFile *file = NULL;
file = g_object_new(PAROLE_TYPE_FILE,
@@ -463,8 +441,7 @@ parole_file_new_with_display_name(const gchar *filename, const gchar *display_na
* Since: 0.4
**/
ParoleFile *
-parole_file_new_cdda_track(const gint track_num, const gchar *display_name)
-{
+parole_file_new_cdda_track(const gint track_num, const gchar *display_name) {
ParoleFile *file = NULL;
gchar *uri = g_strdup_printf("cdda://%i", track_num);
@@ -488,16 +465,15 @@ parole_file_new_cdda_track(const gint track_num, const gchar *display_name)
* Since: 0.4
**/
ParoleFile *
-parole_file_new_dvd_chapter(gint chapter_num, const gchar *display_name)
-{
+parole_file_new_dvd_chapter(gint chapter_num, const gchar *display_name) {
ParoleFile *file = NULL;
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;
@@ -513,8 +489,7 @@ parole_file_new_dvd_chapter(gint chapter_num, const gchar *display_name)
* Since: 0.2
**/
const gchar *
-parole_file_get_file_name(const ParoleFile *file)
-{
+parole_file_get_file_name(const ParoleFile *file) {
g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->filename;
@@ -530,8 +505,7 @@ parole_file_get_file_name(const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_display_name(const ParoleFile *file)
-{
+parole_file_get_display_name(const ParoleFile *file) {
g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->display_name;
@@ -547,8 +521,7 @@ parole_file_get_display_name(const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_uri(const ParoleFile *file)
-{
+parole_file_get_uri(const ParoleFile *file) {
g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->uri;
@@ -564,8 +537,7 @@ parole_file_get_uri(const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_content_type(const ParoleFile *file)
-{
+parole_file_get_content_type(const ParoleFile *file) {
g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->content_type;
@@ -581,8 +553,7 @@ parole_file_get_content_type(const ParoleFile *file)
* Since: 0.2
**/
const gchar *
-parole_file_get_directory(const ParoleFile *file)
-{
+parole_file_get_directory(const ParoleFile *file) {
g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->directory;
@@ -598,27 +569,25 @@ parole_file_get_directory(const ParoleFile *file)
* Since: 0.4
**/
const gchar *
-parole_file_get_custom_subtitles(const ParoleFile *file)
-{
+parole_file_get_custom_subtitles(const ParoleFile *file) {
g_return_val_if_fail(PAROLE_IS_FILE(file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->custom_subtitles;
}
void
-parole_file_set_custom_subtitles(const ParoleFile *file, gchar *suburi)
-{
+parole_file_set_custom_subtitles(const ParoleFile *file, gchar *suburi) {
GValue value = G_VALUE_INIT;
g_value_init(&value, G_TYPE_STRING);
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));
+ "Custom Subtitles",
+ "The custom subtitles set by the user",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY|
+ G_PARAM_READWRITE));
}
/**
@@ -631,27 +600,25 @@ parole_file_set_custom_subtitles(const ParoleFile *file, gchar *suburi)
* Since: 0.4
**/
gint
-parole_file_get_dvd_chapter(const ParoleFile *file)
-{
+parole_file_get_dvd_chapter(const ParoleFile *file) {
// g_return_val_if_fail (PAROLE_IS_FILE (file), NULL);
return PAROLE_FILE_GET_PRIVATE (file)->dvd_chapter;
}
void
-parole_file_set_dvd_chapter(const ParoleFile *file, gint dvd_chapter)
-{
+parole_file_set_dvd_chapter(const ParoleFile *file, gint dvd_chapter) {
GValue value = G_VALUE_INIT;
g_value_init(&value, G_TYPE_INT);
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));
+ "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 2d9d4f0..b5e864b 100644
--- a/src/misc/parole-file.h
+++ b/src/misc/parole-file.h
@@ -38,13 +38,11 @@ G_BEGIN_DECLS
typedef struct _ParoleFile ParoleFile;
typedef struct _ParoleFileClass ParoleFileClass;
-struct _ParoleFile
-{
+struct _ParoleFile {
GObject parent;
};
-struct _ParoleFileClass
-{
+struct _ParoleFileClass {
GObjectClass parent_class;
};
diff --git a/src/misc/parole-filters.c b/src/misc/parole-filters.c
index eea784d..fdd281d 100644
--- a/src/misc/parole-filters.c
+++ b/src/misc/parole-filters.c
@@ -54,8 +54,7 @@ static char *playlist_file_extensions[] = {
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_audio_filter(void)
-{
+GtkFileFilter *parole_get_supported_audio_filter(void) {
GtkFileFilter *filter;
guint i;
@@ -80,8 +79,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;
@@ -105,8 +103,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;
@@ -123,8 +120,7 @@ GtkFileFilter *parole_get_supported_media_filter(void)
return filter;
}
-GtkRecentFilter *parole_get_supported_recent_media_filter(void)
-{
+GtkRecentFilter *parole_get_supported_recent_media_filter(void) {
GtkRecentFilter *filter;
guint i;
@@ -152,8 +148,7 @@ GtkRecentFilter *parole_get_supported_recent_media_filter(void)
*
* Since: 0.2
*/
-GtkFileFilter *parole_get_supported_files_filter(void)
-{
+GtkFileFilter *parole_get_supported_files_filter(void) {
GtkFileFilter *filter;
guint i;
@@ -167,8 +162,7 @@ GtkFileFilter *parole_get_supported_files_filter(void)
return filter;
}
-GtkRecentFilter *parole_get_supported_recent_files_filter(void)
-{
+GtkRecentFilter *parole_get_supported_recent_files_filter(void) {
GtkRecentFilter *filter;
guint i;
@@ -193,8 +187,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;
@@ -219,8 +212,7 @@ GtkFileFilter *parole_get_supported_playlist_filter(void)
*
* Since: 0.2
*/
-gboolean parole_file_filter(GtkFileFilter *filter, ParoleFile *file)
-{
+gboolean parole_file_filter(GtkFileFilter *filter, ParoleFile *file) {
GtkFileFilterInfo filter_info;
gboolean ret;
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index ac34142..ee86f89 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -50,8 +50,7 @@
#include "parole-debug.h"
#include "parole-enum-types.h"
-typedef struct
-{
+typedef struct {
GSList *list;
gboolean started;
gchar *uri;
@@ -61,8 +60,7 @@ typedef struct
gchar *g_substr(const gchar* string, gint start, gint end);
static gchar*
-parole_filename_to_utf8(const gchar* filename)
-{
+parole_filename_to_utf8(const gchar* filename) {
gsize read_size, written;
gchar *utf8;
@@ -77,21 +75,17 @@ 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)
-{
+ gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
- if ( !data->started )
- {
+ if ( !data->started ) {
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)
-{
+parole_xspf_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
const gchar *element_name;
@@ -120,9 +114,7 @@ parole_xspf_xml_text(GMarkupParseContext *context, const gchar *text, gsize text
}
static void
-parole_xspf_xml_end(GMarkupParseContext *context, const gchar *element_name,
- gpointer user_data, GError **error)
-{
+parole_xspf_xml_end(GMarkupParseContext *context, const gchar *element_name, gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
ParoleFile *file;
@@ -132,19 +124,16 @@ parole_xspf_xml_end(GMarkupParseContext *context, const gchar *element_name,
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);
+ 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;
+ g_free(data->uri);
+ data->uri = NULL;
}
- if ( data->title)
- {
+ if (data->title) {
g_free(data->title);
data->title = NULL;
}
@@ -154,31 +143,25 @@ parole_xspf_xml_end(GMarkupParseContext *context, const gchar *element_name,
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)
-{
+ gpointer user_data, GError **error) {
guint i;
ParoleParserData *data = user_data;
- if ( !data->started )
- {
+ if ( !data->started ) {
if (!g_ascii_strcasecmp (element_name, "asx") )
data->started = TRUE;
else
return;
}
- if (!g_ascii_strcasecmp (element_name, "ref") )
- {
- if (data->uri)
- {
+ 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"))
- {
+ for (i = 0; attribute_names[i]; i++) {
+ if (!g_ascii_strcasecmp(attribute_names[i], "href")) {
data->uri = g_strdup(attribute_values[i]);
break;
}
@@ -187,9 +170,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)
-{
+parole_asx_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_len, gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
const gchar *element_name;
@@ -198,10 +179,8 @@ parole_asx_xml_text(GMarkupParseContext *context, const gchar *text, gsize text_
element_name = g_markup_parse_context_get_element(context);
- if (!g_ascii_strcasecmp (element_name, "title") )
- {
- if (data->title)
- {
+ if (!g_ascii_strcasecmp(element_name, "title")) {
+ if (data->title) {
g_free(data->title);
data->title = NULL;
}
@@ -212,22 +191,18 @@ 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)
-{
+parole_asx_xml_end(GMarkupParseContext *context, const gchar *element_name, gpointer user_data, GError **error) {
ParoleParserData *data = user_data;
ParoleFile *file;
- if (!g_ascii_strcasecmp (element_name, "ASX"))
+ if (!g_ascii_strcasecmp(element_name, "ASX"))
data->started = FALSE;
if (!data->started)
return;
- if (!g_ascii_strcasecmp (element_name, "entry"))
- {
- if (data->uri)
- {
+ 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);
@@ -235,8 +210,7 @@ parole_asx_xml_end(GMarkupParseContext *context, const gchar *element_name,
data->uri = NULL;
}
- if ( data->title)
- {
+ if (data->title) {
g_free(data->title);
data->title = NULL;
}
@@ -244,8 +218,7 @@ parole_asx_xml_end(GMarkupParseContext *context, const gchar *element_name,
}
static GSList *
-parole_pl_parser_parse_asx(const gchar *filename)
-{
+parole_pl_parser_parse_asx(const gchar *filename) {
ParoleParserData data;
GFile *file;
gchar *contents;
@@ -299,18 +272,14 @@ out:
}
gchar *
-g_substr(const gchar* string,
- gint start,
- gint end)
-{
+g_substr(const gchar* string, gint start, gint end) {
gsize len = (end - start + 1);
gchar *output = g_malloc0(len + 1);
return g_utf8_strncpy (output, &string[start], len);
}
static GSList *
-parole_pl_parser_parse_m3u(const gchar *filename)
-{
+parole_pl_parser_parse_m3u(const gchar *filename) {
GFile *file;
gchar **lines;
gchar *contents;
@@ -387,8 +356,7 @@ out:
}
static GSList *
-parole_pl_parser_parse_pls(const gchar *filename)
-{
+parole_pl_parser_parse_pls(const gchar *filename) {
XfceRc *rcfile;
GSList *list = NULL;
ParoleFile *file;
@@ -398,14 +366,12 @@ parole_pl_parser_parse_pls(const gchar *filename)
rcfile = xfce_rc_simple_open(filename, TRUE);
- if ( xfce_rc_has_group (rcfile, "playlist") )
- {
+ if (xfce_rc_has_group(rcfile, "playlist")) {
xfce_rc_set_group(rcfile, "playlist");
nentries = xfce_rc_read_int_entry(rcfile, "NumberOfEntries", 0);
- for (i = 1; i <= nentries; i++)
- {
+ for (i = 1; i <= nentries; i++) {
g_snprintf(key, 128, "File%d", i);
file_entry = xfce_rc_read_entry(rcfile, key, NULL);
@@ -428,8 +394,7 @@ parole_pl_parser_parse_pls(const gchar *filename)
}
static GSList *
-parole_pl_parser_parse_xspf(const gchar *filename)
-{
+parole_pl_parser_parse_xspf(const gchar *filename) {
ParoleParserData data;
GFile *file;
gchar *contents;
@@ -452,12 +417,10 @@ parole_pl_parser_parse_xspf(const gchar *filename)
if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL) )
goto out;
- if ( g_utf8_validate (contents, -1, NULL) == FALSE)
- {
+ 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)
- {
+ if (fixed != NULL) {
g_free(contents);
contents = fixed;
}
@@ -485,34 +448,31 @@ out:
}
static GSList *
-parole_pl_parser_parse(ParolePlFormat format, const gchar *filename)
-{
+parole_pl_parser_parse(ParolePlFormat format, const gchar *filename) {
GSList *list = NULL;
- 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;
+ 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;
}
return list;
}
static gboolean
-parole_pl_parser_save_m3u(FILE *f, GSList *files)
-{
+parole_pl_parser_save_m3u(FILE *f, GSList *files) {
guint len;
guint i;
@@ -523,15 +483,13 @@ parole_pl_parser_save_m3u(FILE *f, GSList *files)
len = g_slist_length(files);
- for ( i = 0; i < len; i++)
- {
+ 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)
- {
+ if (display_name && file_name) {
fprintf(f, "#EXTINF:-1,%s\n", display_name);
fprintf(f, "%s\n\n", file_name);
}
@@ -547,8 +505,7 @@ parole_pl_parser_save_m3u(FILE *f, GSList *files)
}
static gboolean
-parole_pl_parser_save_pls(FILE *f, GSList *files)
-{
+parole_pl_parser_save_pls(FILE *f, GSList *files) {
guint len;
guint i;
gchar key[128];
@@ -557,8 +514,7 @@ parole_pl_parser_save_pls(FILE *f, GSList *files)
fprintf(f, "[playlist]\nNumberOfEntries=%d\n", len);
- for ( i = 1; i <= len; i++)
- {
+ for (i = 1; i <= len; i++) {
ParoleFile *file;
file = g_slist_nth_data(files, i - 1);
g_snprintf(key, 128, "File%d", i);
@@ -571,8 +527,7 @@ parole_pl_parser_save_pls(FILE *f, GSList *files)
}
static gboolean
-parole_pl_parser_save_asx(FILE *f, GSList *files)
-{
+parole_pl_parser_save_asx(FILE *f, GSList *files) {
guint len;
guint i;
@@ -580,8 +535,7 @@ parole_pl_parser_save_asx(FILE *f, GSList *files)
fputs("<ASX VERSION=\"3.0\">\n", f);
- for ( i = 0; i < len; i++)
- {
+ 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",
@@ -595,8 +549,7 @@ parole_pl_parser_save_asx(FILE *f, GSList *files)
}
static gboolean
-parole_pl_parser_save_xspf(FILE *f, GSList *files)
-{
+parole_pl_parser_save_xspf(FILE *f, GSList *files) {
guint len;
guint i;
@@ -607,8 +560,7 @@ parole_pl_parser_save_xspf(FILE *f, GSList *files)
fputs(" <trackList>\n", f);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
ParoleFile *file;
file = g_slist_nth_data(files, i);
@@ -633,8 +585,7 @@ parole_pl_parser_save_xspf(FILE *f, GSList *files)
* Since: 0.2
*/
ParolePlFormat
-parole_pl_parser_guess_format_from_extension(const gchar *filename)
-{
+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;
@@ -665,8 +616,7 @@ parole_pl_parser_guess_format_from_extension(const gchar *filename)
* Since: 0.2
*/
ParolePlFormat
-parole_pl_parser_guess_format_from_data(const gchar *filename)
-{
+parole_pl_parser_guess_format_from_data(const gchar *filename) {
GFile *file;
gchar *contents = NULL;
gsize size;
@@ -675,8 +625,7 @@ parole_pl_parser_guess_format_from_data(const gchar *filename)
file = g_file_new_for_path(filename);
- if ( !g_file_load_contents (file, NULL, &contents, &size, NULL, NULL ) )
- {
+ if (!g_file_load_contents(file, NULL, &contents, &size, NULL, NULL)) {
g_debug("Unable to load content of file=%s", filename);
goto out;
}
@@ -710,8 +659,7 @@ out:
*
* Since: 0.2
**/
-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) {
FILE *f;
gboolean ret_val = FALSE;
@@ -719,8 +667,7 @@ gboolean parole_pl_parser_save_from_files(GSList *files, const gchar *filename,
f = fopen(filename, "w");
- switch (format)
- {
+ switch (format) {
case PAROLE_PL_FORMAT_M3U:
ret_val = parole_pl_parser_save_m3u(f, files);
break;
@@ -752,14 +699,12 @@ gboolean parole_pl_parser_save_from_files(GSList *files, const gchar *filename,
*
* Since: 0.2
*/
-GSList *parole_pl_parser_parse_from_file_by_extension(const gchar *filename)
-{
+GSList *parole_pl_parser_parse_from_file_by_extension(const gchar *filename) {
ParolePlFormat format = PAROLE_PL_FORMAT_UNKNOWN;
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;
}
@@ -783,8 +728,7 @@ out:
*
* Since: 0.2
*/
-GSList *parole_pl_parser_parse_all_from_file(const gchar *filename)
-{
+GSList *parole_pl_parser_parse_all_from_file(const gchar *filename) {
GSList *list = NULL;
list = parole_pl_parser_parse_asx(filename);
@@ -806,16 +750,14 @@ GSList *parole_pl_parser_parse_all_from_file(const gchar *filename)
*
* Since: 0.2
*/
-gboolean parole_pl_parser_can_parse_data(const guchar *data, gint len)
-{
+gboolean parole_pl_parser_can_parse_data(const guchar *data, gint len) {
gchar *mime_type = NULL;
gboolean result_uncertain;
gboolean result = FALSE;
mime_type = g_content_type_guess(NULL, data, len, &result_uncertain);
- if ( mime_type && result_uncertain == FALSE )
- {
+ 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);
diff --git a/src/misc/parole-pl-parser.h b/src/misc/parole-pl-parser.h
index 8ea6067..d9cb1bb 100644
--- a/src/misc/parole-pl-parser.h
+++ b/src/misc/parole-pl-parser.h
@@ -42,8 +42,7 @@ G_BEGIN_DECLS
* Parole Playlist Formats.
*
**/
-typedef enum
-{
+typedef enum {
PAROLE_PL_FORMAT_UNKNOWN,
PAROLE_PL_FORMAT_M3U,
PAROLE_PL_FORMAT_PLS,
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index 99f5712..4242dfd 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -32,14 +32,11 @@ 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)
-{
+parole_provider_player_get_type(void) {
static GType type = G_TYPE_INVALID;
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- static const GTypeInfo info =
- {
+ if (G_UNLIKELY(type == G_TYPE_INVALID)) {
+ static const GTypeInfo info = {
sizeof (ParoleProviderPlayerIface),
(GBaseInitFunc) parole_provider_player_base_init,
NULL,
@@ -60,12 +57,10 @@ parole_provider_player_get_type(void)
return type;
}
-static void parole_provider_player_base_init(gpointer klass)
-{
+static void parole_provider_player_base_init(gpointer klass) {
static gboolean initialized = FALSE;
- if (G_UNLIKELY (!initialized))
- {
+ if (G_UNLIKELY(!initialized)) {
/**
* ParoleProviderPlayerIface::state-changed:
* @player: the object which received the signal.
@@ -123,8 +118,7 @@ static void parole_provider_player_base_init(gpointer klass)
}
}
-static void parole_provider_player_class_init(gpointer klass)
-{
+static void parole_provider_player_class_init(gpointer klass) {
}
/**
@@ -138,15 +132,13 @@ static void parole_provider_player_class_init(gpointer klass)
*
* Since: 0.2
**/
-GtkWidget *parole_provider_player_get_main_window(ParoleProviderPlayer *player)
-{
+GtkWidget *parole_provider_player_get_main_window(ParoleProviderPlayer *player) {
GtkWidget *window = NULL;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), NULL);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_main_window )
- {
- window =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_main_window)(player);
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_main_window) {
+ window = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_main_window)(player);
}
return window;
}
@@ -167,14 +159,11 @@ 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)
-{
+void parole_provider_player_pack(ParoleProviderPlayer *player, GtkWidget *widget, const gchar *title, ParolePluginContainer container) {
g_return_if_fail(PAROLE_IS_PROVIDER_PLAYER(player));
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pack )
- {
-(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pack)(player, widget, title, container);
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pack) {
+ (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pack)(player, widget, title, container);
}
}
@@ -189,14 +178,12 @@ void parole_provider_player_pack(ParoleProviderPlayer *player, GtkWidget *widget
*
* Since: 0.2
**/
-ParoleState parole_provider_player_get_state(ParoleProviderPlayer *player)
-{
+ParoleState parole_provider_player_get_state(ParoleProviderPlayer *player) {
ParoleState state = PAROLE_STATE_STOPPED;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), PAROLE_STATE_STOPPED);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_state )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_state) {
state =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_state)(player);
}
@@ -213,13 +200,11 @@ ParoleState parole_provider_player_get_state(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-const ParoleStream *parole_provider_player_get_stream(ParoleProviderPlayer *player)
-{
+const ParoleStream *parole_provider_player_get_stream(ParoleProviderPlayer *player) {
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), NULL);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
- {
- return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream) (player);
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_stream) {
+ return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_stream) (player);
}
return NULL;
@@ -240,14 +225,12 @@ const ParoleStream *parole_provider_player_get_stream(ParoleProviderPlayer *play
*
* Since: 0.2
**/
-gboolean parole_provider_player_play_uri(ParoleProviderPlayer *player, const gchar *uri)
-{
+gboolean parole_provider_player_play_uri(ParoleProviderPlayer *player, const gchar *uri) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_uri )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_uri) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_uri)(player, uri);
}
return ret;
@@ -269,14 +252,12 @@ gboolean parole_provider_player_play_uri(ParoleProviderPlayer *player, const gch
*
* Since: 0.2
**/
-gboolean parole_provider_player_pause(ParoleProviderPlayer *player)
-{
+gboolean parole_provider_player_pause(ParoleProviderPlayer *player) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->pause )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pause) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->pause)(player);
}
@@ -300,14 +281,12 @@ gboolean parole_provider_player_pause(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-gboolean parole_provider_player_resume(ParoleProviderPlayer *player)
-{
+gboolean parole_provider_player_resume(ParoleProviderPlayer *player) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->resume )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->resume) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->resume)(player);
}
@@ -328,14 +307,12 @@ gboolean parole_provider_player_resume(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-gboolean parole_provider_player_stop(ParoleProviderPlayer *player)
-{
+gboolean parole_provider_player_stop(ParoleProviderPlayer *player) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->stop )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->stop) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->stop)(player);
}
@@ -353,14 +330,12 @@ gboolean parole_provider_player_stop(ParoleProviderPlayer *player)
*
* Since: 0.6
**/
-gboolean parole_provider_player_play_previous(ParoleProviderPlayer *player)
-{
+gboolean parole_provider_player_play_previous(ParoleProviderPlayer *player) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_previous )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_previous) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_previous)(player);
}
@@ -378,14 +353,12 @@ gboolean parole_provider_player_play_previous(ParoleProviderPlayer *player)
*
* Since: 0.6
**/
-gboolean parole_provider_player_play_next(ParoleProviderPlayer *player)
-{
+gboolean parole_provider_player_play_next(ParoleProviderPlayer *player) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->play_next )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_next) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->play_next)(player);
}
@@ -406,14 +379,12 @@ gboolean parole_provider_player_play_next(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-gboolean parole_provider_player_seek(ParoleProviderPlayer *player, gdouble pos)
-{
+gboolean parole_provider_player_seek(ParoleProviderPlayer *player, gdouble pos) {
gboolean ret = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->seek )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->seek) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->seek)(player, pos);
}
@@ -430,13 +401,11 @@ gboolean parole_provider_player_seek(ParoleProviderPlayer *player, gdouble pos)
*
* Since: 0.6
**/
-gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer *player)
-{
+gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer *player) {
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), 0);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream_position )
- {
- return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream_position) (player);
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_stream_position) {
+ return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_stream_position) (player);
}
return FALSE;
@@ -451,13 +420,11 @@ gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer *player)
*
* Since: 0.2
**/
-void parole_provider_player_open_media_chooser(ParoleProviderPlayer *player)
-{
+void parole_provider_player_open_media_chooser(ParoleProviderPlayer *player) {
g_return_if_fail(PAROLE_IS_PROVIDER_PLAYER(player));
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->open_media_chooser )
- {
-(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->open_media_chooser)(player);
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->open_media_chooser) {
+ (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->open_media_chooser)(player);
}
}
@@ -473,14 +440,12 @@ void parole_provider_player_open_media_chooser(ParoleProviderPlayer *player)
*
* Since: 0.6
**/
-GSimpleAction *parole_provider_player_get_action(ParoleProviderPlayer *player, ParolePlayerAction action)
-{
+GSimpleAction *parole_provider_player_get_action(ParoleProviderPlayer *player, ParolePlayerAction action) {
GSimpleAction *ret = NULL;;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), NULL);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_action )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_action) {
ret =(*PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_action)(player, action);
}
@@ -497,12 +462,10 @@ GSimpleAction *parole_provider_player_get_action(ParoleProviderPlayer *player, P
*
* Since: 0.6
**/
-gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
-{
+gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player) {
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_fullscreen) {
return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen) (player);
}
@@ -520,12 +483,10 @@ gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
*
* Since: 0.6
**/
-gboolean parole_provider_player_set_fullscreen(ParoleProviderPlayer *player, gboolean fullscreen)
-{
+gboolean parole_provider_player_set_fullscreen(ParoleProviderPlayer *player, gboolean fullscreen) {
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLAYER(player), FALSE);
- if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
- {
+ if (PAROLE_PROVIDER_PLAYER_GET_INTERFACE(player)->get_stream) {
return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->set_fullscreen) (player, fullscreen);
}
diff --git a/src/misc/parole-provider-player.h b/src/misc/parole-provider-player.h
index 1083fcf..f19e6bb 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -49,16 +49,14 @@ typedef struct _ParoleProviderPlayer ParoleProviderPlayer;
* Available plugin widget containers.
*
**/
-typedef enum
-{
+typedef enum {
PAROLE_PLUGIN_CONTAINER_PLAYLIST,
PAROLE_PLUGIN_CONTAINER_MAIN_VIEW
} ParolePluginContainer;
-struct _ParoleProviderPlayerIface
-{
+struct _ParoleProviderPlayerIface {
GTypeInterface __parent__;
/*< private >*/
diff --git a/src/misc/parole-provider-plugin.c b/src/misc/parole-provider-plugin.c
index 36649b3..ca72eaf 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -27,14 +27,11 @@
#include "parole-provider-plugin.h"
GType
-parole_provider_plugin_get_type(void)
-{
+parole_provider_plugin_get_type(void) {
static GType type = G_TYPE_INVALID;
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- static const GTypeInfo info =
- {
+ if (G_UNLIKELY(type == G_TYPE_INVALID)) {
+ static const GTypeInfo info = {
sizeof (ParoleProviderPluginIface),
NULL,
NULL,
@@ -64,14 +61,12 @@ parole_provider_plugin_get_type(void)
*
* Since: 0.2
**/
-gboolean parole_provider_plugin_get_is_configurable(ParoleProviderPlugin *provider)
-{
+gboolean parole_provider_plugin_get_is_configurable(ParoleProviderPlugin *provider) {
gboolean configurable = FALSE;
g_return_val_if_fail(PAROLE_IS_PROVIDER_PLUGIN(provider), FALSE);
- if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->get_is_configurable )
- {
+ if (PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->get_is_configurable) {
configurable =(*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->get_is_configurable)(provider);
}
@@ -88,13 +83,11 @@ gboolean parole_provider_plugin_get_is_configurable(ParoleProviderPlugin *provid
*
* Since: 0.2
**/
-void parole_provider_plugin_configure(ParoleProviderPlugin *provider, GtkWidget *parent)
-{
+void parole_provider_plugin_configure(ParoleProviderPlugin *provider, GtkWidget *parent) {
g_return_if_fail(PAROLE_IS_PROVIDER_PLUGIN(provider));
- if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->configure )
- {
-(*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->configure)(provider, parent);
+ if (PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->configure) {
+ (*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->configure)(provider, parent);
}
}
@@ -108,10 +101,8 @@ void parole_provider_plugin_configure(ParoleProviderPlugin *provider, GtkWidget
*
* Since: 0.2
**/
-void parole_provider_plugin_set_player(ParoleProviderPlugin *provider, ParoleProviderPlayer *player)
-{
- if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)->set_player )
- {
-(*PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->set_player)(provider, player);
+void parole_provider_plugin_set_player(ParoleProviderPlugin *provider, ParoleProviderPlayer *player) {
+ if (PAROLE_PROVIDER_PLUGIN_GET_INTERFACE(provider)->set_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 2957b0a..0a60cb2 100644
--- a/src/misc/parole-provider-plugin.h
+++ b/src/misc/parole-provider-plugin.h
@@ -41,8 +41,7 @@ G_BEGIN_DECLS
typedef struct _ParoleProviderPluginIface ParoleProviderPluginIface;
typedef struct _ParoleProviderPlugin ParoleProviderPlugin;
-struct _ParoleProviderPluginIface
-{
+struct _ParoleProviderPluginIface {
GTypeInterface __parent__;
/*< public >*/
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index a2db450..2883f49 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -48,8 +48,7 @@
typedef struct _ParoleStreamPrivate ParoleStreamPrivate;
-struct _ParoleStreamPrivate
-{
+struct _ParoleStreamPrivate {
/*Properties*/
gchar *uri;
gchar *subtitles;
@@ -79,8 +78,7 @@ struct _ParoleStreamPrivate
ParoleMediaType media_type;
};
-enum
-{
+enum {
PROP_0,
PROP_URI,
PROP_SUBTITLES,
@@ -111,8 +109,7 @@ enum
G_DEFINE_TYPE(ParoleStream, parole_stream, G_TYPE_OBJECT)
static void
-parole_stream_get_media_type_from_uri(ParoleStream *stream, const gchar *uri)
-{
+parole_stream_get_media_type_from_uri(ParoleStream *stream, const gchar *uri) {
GValue val = { 0, };
ParoleMediaType type = PAROLE_MEDIA_TYPE_UNKNOWN;
@@ -141,15 +138,13 @@ 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)
- {
+ switch (prop_id) {
case PROP_URI:
{
ParoleStreamPrivate *priv;
@@ -244,15 +239,13 @@ static void parole_stream_set_property(GObject *object,
}
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)
- {
+ switch (prop_id) {
case PROP_URI:
g_value_set_string(value, PAROLE_STREAM_GET_PRIVATE(stream)->uri);
break;
@@ -332,8 +325,7 @@ static void parole_stream_get_property(GObject *object,
}
static void
-parole_stream_finalize(GObject *object)
-{
+parole_stream_finalize(GObject *object) {
ParoleStream *stream;
stream = PAROLE_STREAM(object);
@@ -354,8 +346,7 @@ parole_stream_finalize(GObject *object)
* Since: 0.6
**/
void
-parole_stream_set_image(GObject *object, GdkPixbuf *pixbuf)
-{
+parole_stream_set_image(GObject *object, GdkPixbuf *pixbuf) {
ParoleStream *stream;
gchar *filename = NULL;
gint fid;
@@ -384,8 +375,7 @@ parole_stream_set_image(GObject *object, GdkPixbuf *pixbuf)
}
GdkPixbuf *
-parole_stream_get_image(GObject *object)
-{
+parole_stream_get_image(GObject *object) {
ParoleStream *stream;
GdkPixbuf *pixbuf;
@@ -400,8 +390,7 @@ parole_stream_get_image(GObject *object)
}
static void
-parole_stream_class_init(ParoleStreamClass *klass)
-{
+parole_stream_class_init(ParoleStreamClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_stream_finalize;
@@ -417,12 +406,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:
@@ -433,12 +422,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:
@@ -448,12 +437,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:
*
@@ -462,12 +451,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:
@@ -477,12 +466,12 @@ 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:
@@ -492,13 +481,13 @@ parole_stream_class_init(ParoleStreamClass *klass)
* 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:
@@ -509,12 +498,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:
@@ -524,13 +513,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:
@@ -540,12 +529,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:
@@ -555,13 +544,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:
@@ -571,13 +560,13 @@ 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:
@@ -587,13 +576,13 @@ 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:
@@ -603,13 +592,13 @@ 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:
@@ -619,13 +608,13 @@ 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:
@@ -636,13 +625,13 @@ 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:
@@ -654,13 +643,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:
*
@@ -669,12 +658,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));
/**
@@ -685,12 +674,12 @@ 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:
@@ -700,12 +689,12 @@ 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:
@@ -715,12 +704,12 @@ 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:
@@ -730,12 +719,12 @@ 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));
/**
* ParoleStream:genre:
@@ -745,12 +734,12 @@ parole_stream_class_init(ParoleStreamClass *klass)
* Since: 0.6
**/
g_object_class_install_property(object_class,
- PROP_GENRE,
- g_param_spec_string("genre",
- "Genre",
- "Genre",
- NULL,
- G_PARAM_READWRITE));
+ PROP_GENRE,
+ g_param_spec_string("genre",
+ "Genre",
+ "Genre",
+ NULL,
+ G_PARAM_READWRITE));
/**
* ParoleStream:image_uri:
@@ -760,12 +749,12 @@ parole_stream_class_init(ParoleStreamClass *klass)
* Since: 0.6
**/
g_object_class_install_property(object_class,
- PROP_IMAGE_URI,
- g_param_spec_string("image_uri",
- "Image URI",
- "URI for the album artwork",
- NULL,
- G_PARAM_READWRITE));
+ PROP_IMAGE_URI,
+ g_param_spec_string("image_uri",
+ "Image URI",
+ "URI for the album artwork",
+ NULL,
+ G_PARAM_READWRITE));
/**
* ParoleStream:bitrate:
@@ -775,33 +764,30 @@ parole_stream_class_init(ParoleStreamClass *klass)
* Since: 0.6
**/
g_object_class_install_property(object_class,
- PROP_BITRATE,
- g_param_spec_uint("bitrate",
- "Bitrate",
- "Bitrate",
- 0, 2147483647,
- 0,
- G_PARAM_READWRITE));
+ PROP_BITRATE,
+ g_param_spec_uint("bitrate",
+ "Bitrate",
+ "Bitrate",
+ 0, 2147483647,
+ 0,
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParoleStreamPrivate));
}
static void
-parole_stream_init(ParoleStream *stream)
-{
+parole_stream_init(ParoleStream *stream) {
parole_stream_init_properties(stream);
}
ParoleStream *
-parole_stream_new(void)
-{
+parole_stream_new(void) {
ParoleStream *stream = NULL;
stream = g_object_new(PAROLE_TYPE_STREAM, NULL);
return stream;
}
-void parole_stream_init_properties(ParoleStream *stream)
-{
+void parole_stream_init_properties(ParoleStream *stream) {
ParoleStreamPrivate *priv;
priv = PAROLE_STREAM_GET_PRIVATE(stream);
@@ -833,8 +819,7 @@ void parole_stream_init_properties(ParoleStream *stream)
PAROLE_STREAM_FREE_STR_PROP(priv->image_uri);
/* Remove the previous image if it exists */
- if ( PAROLE_STREAM_GET_PRIVATE (stream)->previous_image )
- {
+ if (PAROLE_STREAM_GET_PRIVATE(stream)->previous_image) {
if (g_remove (PAROLE_STREAM_GET_PRIVATE (stream)->previous_image) != 0)
g_warning("Failed to remove temporary artwork");
}
diff --git a/src/misc/parole-stream.h b/src/misc/parole-stream.h
index 904ed2e..5123c37 100644
--- a/src/misc/parole-stream.h
+++ b/src/misc/parole-stream.h
@@ -50,8 +50,7 @@ G_BEGIN_DECLS
* Media types.
*
**/
-typedef enum
-{
+typedef enum {
PAROLE_MEDIA_TYPE_UNKNOWN,
PAROLE_MEDIA_TYPE_LOCAL_FILE,
PAROLE_MEDIA_TYPE_CDDA,
@@ -73,8 +72,7 @@ typedef enum
* Media playback states.
*
**/
-typedef enum
-{
+typedef enum {
PAROLE_STATE_STOPPED = 0,
PAROLE_STATE_PLAYBACK_FINISHED,
PAROLE_STATE_ABOUT_TO_FINISH,
@@ -86,13 +84,11 @@ typedef enum
typedef struct _ParoleStream ParoleStream;
typedef struct _ParoleStreamClass ParoleStreamClass;
-struct _ParoleStream
-{
+struct _ParoleStream {
GObject parent;
};
-struct _ParoleStreamClass
-{
+struct _ParoleStreamClass {
GObjectClass parent_class;
};
diff --git a/src/parole-about.c b/src/parole-about.c
index ad9007c..259df17 100644
--- a/src/parole-about.c
+++ b/src/parole-about.c
@@ -42,11 +42,9 @@
*
* Display the About dialog for Parole.
**/
-void parole_about(GtkWindow *parent)
-{
+void parole_about(GtkWindow *parent) {
/* List of authors */
- static const gchar *authors[] =
- {
+ static const gchar *authors[] = {
"Ali Abdallah <aliov at xfce.org>",
"Sean Davis <bluesabre at xfce.org>",
"Simon Steinbeiss <simon at xfce.org>",
@@ -54,8 +52,7 @@ void parole_about(GtkWindow *parent)
};
/* List of documentation writers */
- static const gchar *documenters[] =
- {
+ static const gchar *documenters[] = {
"Ali Abdallah <aliov at xfce.org>",
NULL,
};
diff --git a/src/parole-builder.c b/src/parole-builder.c
index 5008a1c..37e5788 100644
--- a/src/parole-builder.c
+++ b/src/parole-builder.c
@@ -40,8 +40,7 @@
* Build Parole's UI from the interface-file.
**/
GtkBuilder *
-parole_builder_get_main_interface(void)
-{
+parole_builder_get_main_interface(void) {
static gpointer parole_builder_object = NULL;
if ( G_LIKELY(parole_builder_object != NULL) ) {
@@ -62,8 +61,7 @@ parole_builder_get_main_interface(void)
* Build Parole's UI from the condensed glade string.
**/
GtkBuilder *
-parole_builder_new_from_string(const gchar *ui, gsize length)
-{
+parole_builder_new_from_string(const gchar *ui, gsize length) {
GError *error = NULL;
GtkBuilder *builder;
@@ -74,8 +72,7 @@ parole_builder_new_from_string(const gchar *ui, gsize length)
gtk_builder_add_from_string(builder, ui, length, &error);
- if ( error )
- {
+ if ( error ) {
g_critical("%s", error->message);
g_error_free(error);
}
diff --git a/src/parole-button.c b/src/parole-button.c
index 607cd20..b182bd6 100644
--- a/src/parole-button.c
+++ b/src/parole-button.c
@@ -56,20 +56,17 @@ static void parole_button_finalize(GObject *object);
#define PAROLE_BUTTON_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_BUTTON, ParoleButtonPrivate))
-static struct
-{
+static struct {
ParoleButtonKey key;
guint key_code;
} parole_key_map[PAROLE_KEY_NUMBERS] = { {0, 0}, };
-struct ParoleButtonPrivate
-{
+struct ParoleButtonPrivate {
GdkScreen *screen;
GdkWindow *window;
};
-enum
-{
+enum {
BUTTON_PRESSED,
LAST_SIGNAL
};
@@ -87,14 +84,12 @@ G_DEFINE_TYPE(ParoleButton, parole_button, G_TYPE_OBJECT)
* Check if the pressed key is mapped to a function in Parole.
**/
static guint
-parole_button_get_key(unsigned int keycode)
-{
+parole_button_get_key(unsigned int keycode) {
ParoleButtonKey key = PAROLE_KEY_UNKNOWN;
guint i;
- for ( i = 0; i < G_N_ELEMENTS (parole_key_map); i++)
- {
+ for (i = 0; i < G_N_ELEMENTS(parole_key_map); i++) {
if ( parole_key_map[i].key_code == keycode )
key = parole_key_map[i].key;
}
@@ -111,8 +106,7 @@ parole_button_get_key(unsigned int keycode)
* Filter X events for keypresses, and pass the keypresses on to be processed.
**/
static GdkFilterReturn
-parole_button_filter_x_events(GdkXEvent *xevent, GdkEvent *ev, gpointer data)
-{
+parole_button_filter_x_events(GdkXEvent *xevent, GdkEvent *ev, gpointer data) {
ParoleButtonKey key;
ParoleButton *button;
@@ -123,8 +117,7 @@ parole_button_filter_x_events(GdkXEvent *xevent, GdkEvent *ev, gpointer data)
key = parole_button_get_key(xev->xkey.keycode);
- if ( key != PAROLE_KEY_UNKNOWN )
- {
+ if ( key != PAROLE_KEY_UNKNOWN ) {
button = (ParoleButton *) data;
PAROLE_DEBUG_ENUM("Key press", key, ENUM_GTYPE_BUTTON_KEY);
@@ -146,8 +139,7 @@ parole_button_filter_x_events(GdkXEvent *xevent, GdkEvent *ev, gpointer data)
* Return value: %TRUE on success, else %FALSE.
**/
static gboolean
-parole_button_grab_keystring(ParoleButton *button, guint keycode)
-{
+parole_button_grab_keystring(ParoleButton *button, guint keycode) {
GdkDisplay *display;
guint ret;
guint modmask = 0;
@@ -160,19 +152,17 @@ parole_button_grab_keystring(ParoleButton *button, guint keycode)
gdk_x11_window_get_xid(button->priv->window), True,
GrabModeAsync, GrabModeAsync);
- if ( ret == BadAccess )
- {
- g_warning("Failed to grab modmask=%u, keycode=%li",
- modmask, (long int) keycode);
- return FALSE;
+ if ( ret == BadAccess ) {
+ g_warning("Failed to grab modmask=%u, keycode=%li",
+ modmask, (long int) keycode);
+ return FALSE;
}
ret = XGrabKey(GDK_DISPLAY_XDISPLAY(display), keycode, LockMask | modmask,
gdk_x11_window_get_xid(button->priv->window), True,
GrabModeAsync, GrabModeAsync);
- if (ret == BadAccess)
- {
+ if (ret == BadAccess) {
g_warning("Failed to grab modmask=%u, keycode=%li",
LockMask | modmask, (long int) keycode);
return FALSE;
@@ -194,18 +184,15 @@ parole_button_grab_keystring(ParoleButton *button, guint keycode)
* Return value: %TRUE on success, else %FALSE.
**/
static gboolean
-parole_button_xevent_key(ParoleButton *button, guint keysym , ParoleButtonKey key)
-{
+parole_button_xevent_key(ParoleButton *button, guint keysym , ParoleButtonKey key) {
guint keycode = XKeysymToKeycode(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), keysym);
- if ( keycode == 0 )
- {
+ if ( keycode == 0 ) {
g_warning("could not map keysym %x to keycode\n", keysym);
return FALSE;
}
- if ( !parole_button_grab_keystring(button, keycode))
- {
+ if (!parole_button_grab_keystring(button, keycode)) {
g_warning("Failed to grab %i\n", keycode);
return FALSE;
}
@@ -225,8 +212,7 @@ parole_button_xevent_key(ParoleButton *button, guint keysym , ParoleButtonKey ke
* Setup Parole's keyboard mappings.
**/
static void
-parole_button_setup(ParoleButton *button)
-{
+parole_button_setup(ParoleButton *button) {
button->priv->screen = gdk_screen_get_default();
button->priv->window = gdk_screen_get_root_window(button->priv->screen);
@@ -246,8 +232,7 @@ parole_button_setup(ParoleButton *button)
* Initialize a #ParoleButtonClass instance.
**/
static void
-parole_button_class_init(ParoleButtonClass *klass)
-{
+parole_button_class_init(ParoleButtonClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
signals[BUTTON_PRESSED] =
@@ -271,8 +256,7 @@ parole_button_class_init(ParoleButtonClass *klass)
* Initialize a #ParoleButton instance.
**/
static void
-parole_button_init(ParoleButton *button)
-{
+parole_button_init(ParoleButton *button) {
button->priv = PAROLE_BUTTON_GET_PRIVATE(button);
button->priv->screen = NULL;
@@ -288,8 +272,7 @@ parole_button_init(ParoleButton *button)
* Finalize a #ParoleButton object.
**/
static void
-parole_button_finalize(GObject *object)
-{
+parole_button_finalize(GObject *object) {
G_OBJECT_CLASS(parole_button_parent_class)->finalize(object);
}
@@ -299,8 +282,7 @@ parole_button_finalize(GObject *object)
* Create a new #ParoleButton instance.
**/
ParoleButton *
-parole_button_new(void)
-{
+parole_button_new(void) {
ParoleButton *button = NULL;
button = g_object_new(PAROLE_TYPE_BUTTON, NULL);
diff --git a/src/parole-button.h b/src/parole-button.h
index 1242d43..2a4e696 100644
--- a/src/parole-button.h
+++ b/src/parole-button.h
@@ -25,8 +25,7 @@
#include <glib-object.h>
-typedef enum
-{
+typedef enum {
PAROLE_KEY_UNKNOWN,
PAROLE_KEY_AUDIO_PLAY,
PAROLE_KEY_AUDIO_STOP,
@@ -45,14 +44,12 @@ G_BEGIN_DECLS
typedef struct ParoleButtonPrivate ParoleButtonPrivate;
-typedef struct
-{
+typedef struct {
GObject parent;
ParoleButtonPrivate *priv;
} ParoleButton;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
void (*button_pressed) (ParoleButton *button,
diff --git a/src/parole-clutter.c b/src/parole-clutter.c
index 462b903..9b7417f 100644
--- a/src/parole-clutter.c
+++ b/src/parole-clutter.c
@@ -38,8 +38,7 @@
#define PAROLE_CLUTTER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_CLUTTER, ParoleClutterPrivate))
-struct ParoleClutterPrivate
-{
+struct ParoleClutterPrivate {
GtkWidget *embed;
ClutterActor *stage;
@@ -53,8 +52,7 @@ struct ParoleClutterPrivate
gint video_h;
};
-enum
-{
+enum {
PROP_0,
PROP_CONF_OBJ
};
@@ -64,8 +62,7 @@ static gpointer parole_clutter_object = NULL;
G_DEFINE_TYPE(ParoleClutter, parole_clutter, GTK_TYPE_WIDGET)
static void
-parole_clutter_finalize(GObject *object)
-{
+parole_clutter_finalize(GObject *object) {
// ParoleClutter *clutter;
// clutter = PAROLE_CLUTTER (object);
@@ -76,8 +73,7 @@ parole_clutter_finalize(GObject *object)
}
static void
-parole_clutter_show(GtkWidget *widget)
-{
+parole_clutter_show(GtkWidget *widget) {
ParoleClutter *clutter = PAROLE_CLUTTER(parole_clutter_get());
GtkWidget *embed_window = clutter->priv->embed;
@@ -89,8 +85,7 @@ parole_clutter_show(GtkWidget *widget)
}
static void
-parole_clutter_hide(GtkWidget *widget)
-{
+parole_clutter_hide(GtkWidget *widget) {
ParoleClutter *clutter = PAROLE_CLUTTER(parole_clutter_get());
GtkWidget *embed_window = clutter->priv->embed;
@@ -102,16 +97,14 @@ parole_clutter_hide(GtkWidget *widget)
}
static void
-parole_clutter_constructed(GObject *object)
-{
+parole_clutter_constructed(GObject *object) {
// ParoleClutter *clutter;
// clutter = PAROLE_CLUTTER (object);
}
static void
-parole_clutter_get_video_output_size(ParoleClutter *clutter, gint *ret_w, gint *ret_h)
-{
+parole_clutter_get_video_output_size(ParoleClutter *clutter, gint *ret_w, gint *ret_h) {
guint video_w, video_h;
guint video_par_n, video_par_d;
guint dar_n, dar_d;
@@ -131,10 +124,8 @@ parole_clutter_get_video_output_size(ParoleClutter *clutter, gint *ret_w, gint *
video_w = clutter->priv->video_w;
video_h = clutter->priv->video_h;
- if ( video_w != 0 && video_h != 0 )
- {
- switch ( clutter->priv->aspect_ratio )
- {
+ if ( video_w != 0 && video_h != 0 ) {
+ switch ( clutter->priv->aspect_ratio ) {
case PAROLE_ASPECT_RATIO_NONE:
return;
case PAROLE_ASPECT_RATIO_AUTO:
@@ -164,8 +155,7 @@ parole_clutter_get_video_output_size(ParoleClutter *clutter, gint *ret_w, gint *
if ( gst_video_calculate_display_ratio (&dar_n, &dar_d,
video_w, video_h,
video_par_n, video_par_d,
- disp_par_n, disp_par_d) )
- {
+ disp_par_n, disp_par_d) ) {
if (video_w % dar_n == 0) {
*ret_w = video_w;
*ret_h =(guint) gst_util_uint64_scale(video_w, dar_d, dar_n);
@@ -179,16 +169,14 @@ parole_clutter_get_video_output_size(ParoleClutter *clutter, gint *ret_w, gint *
}
static void
-parole_clutter_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
+parole_clutter_size_allocate(GtkWidget *widget, GtkAllocation *allocation) {
ParoleClutter *clutter;
g_return_if_fail(allocation != NULL);
gtk_widget_set_allocation(widget, allocation);
- if ( gtk_widget_get_realized (widget) )
- {
+ if (gtk_widget_get_realized(widget)) {
gint w, h;
gdouble ratio, width, height;
@@ -221,14 +209,12 @@ parole_clutter_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
}
static void
-parole_clutter_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleClutter *clutter)
-{
+parole_clutter_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleClutter *clutter) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
- if ( !g_strcmp0 ("aspect-ratio", spec->name) )
- {
+ if (!g_strcmp0("aspect-ratio", spec->name)) {
g_object_get(G_OBJECT(clutter->priv->conf),
- "aspect-ratio", &clutter->priv->aspect_ratio,
- NULL);
+ "aspect-ratio", &clutter->priv->aspect_ratio,
+ NULL);
gtk_widget_get_allocation(GTK_WIDGET(clutter), allocation);
parole_clutter_size_allocate(GTK_WIDGET(clutter->priv->embed), allocation);
@@ -239,13 +225,11 @@ parole_clutter_conf_notify_cb(GObject *object, GParamSpec *spec, ParoleClutter *
static void parole_clutter_get_property(GObject *object,
guint prop_id,
GValue *value,
- GParamSpec *pspec)
-{
+ GParamSpec *pspec) {
ParoleClutter *clutter;
clutter = PAROLE_CLUTTER(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_CONF_OBJ:
g_value_set_pointer(value, clutter->priv->conf);
break;
@@ -256,20 +240,17 @@ static void parole_clutter_get_property(GObject *object,
}
static void parole_clutter_set_property(GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec) {
ParoleClutter *clutter;
clutter = PAROLE_CLUTTER(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_CONF_OBJ:
clutter->priv->conf = g_value_get_pointer(value);
- if (clutter->priv->conf)
- {
+ if (clutter->priv->conf) {
g_object_get(G_OBJECT(clutter->priv->conf),
"aspect-ratio", &clutter->priv->aspect_ratio,
NULL);
@@ -285,8 +266,7 @@ static void parole_clutter_set_property(GObject *object,
}
static void
-parole_clutter_class_init(ParoleClutterClass *klass)
-{
+parole_clutter_class_init(ParoleClutterClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
@@ -310,8 +290,7 @@ parole_clutter_class_init(ParoleClutterClass *klass)
}
static void
-parole_clutter_init(ParoleClutter *clutter)
-{
+parole_clutter_init(ParoleClutter *clutter) {
ClutterColor *black;
GValue value = {0};
@@ -341,19 +320,17 @@ parole_clutter_init(ParoleClutter *clutter)
}
GtkWidget *
-parole_clutter_new(gpointer conf_obj)
-{
+parole_clutter_new(gpointer conf_obj) {
parole_clutter_object = g_object_new(PAROLE_TYPE_CLUTTER,
- "conf-object", conf_obj,
- NULL);
+ "conf-object", conf_obj,
+ NULL);
g_object_add_weak_pointer(parole_clutter_object, &parole_clutter_object);
return GTK_WIDGET (parole_clutter_object);
}
-GtkWidget *parole_clutter_get(void)
-{
+GtkWidget *parole_clutter_get(void) {
if ( G_LIKELY(parole_clutter_object != NULL ) ) {
/*
* Don't increase the reference count of this object as
@@ -368,18 +345,15 @@ GtkWidget *parole_clutter_get(void)
return GTK_WIDGET (parole_clutter_object);
}
-void parole_clutter_set_video_dimensions(ParoleClutter *clutter, gint w, gint h)
-{
+void parole_clutter_set_video_dimensions(ParoleClutter *clutter, gint w, gint h) {
clutter->priv->video_w = w;
clutter->priv->video_h = h;
}
-void parole_clutter_apply_texture(ParoleClutter *clutter, GstElement **element)
-{
+void parole_clutter_apply_texture(ParoleClutter *clutter, GstElement **element) {
g_object_set(*element, "texture", clutter->priv->texture, NULL);
}
-GtkWidget *parole_clutter_get_embed_widget(ParoleClutter *clutter)
-{
+GtkWidget *parole_clutter_get_embed_widget(ParoleClutter *clutter) {
return clutter->priv->embed;
}
diff --git a/src/parole-clutter.h b/src/parole-clutter.h
index 03d960d..fcdc9b3 100644
--- a/src/parole-clutter.h
+++ b/src/parole-clutter.h
@@ -38,14 +38,12 @@ G_BEGIN_DECLS
typedef struct ParoleClutterPrivate ParoleClutterPrivate;
-typedef struct
-{
+typedef struct {
GtkWidget parent;
ParoleClutterPrivate *priv;
} ParoleClutter;
-typedef struct
-{
+typedef struct {
GtkWidgetClass parent_class;
} ParoleClutterClass;
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index c295f2b..c65460c 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -88,8 +88,7 @@ void reset_color_clicked_cb(GtkButton *button,
#define PAROLE_CONF_DIALOG_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_CONF_DIALOG, ParoleConfDialogPrivate))
-struct ParoleConfDialogPrivate
-{
+struct ParoleConfDialogPrivate {
ParoleConf *conf;
GHashTable *vis_plugins;
@@ -111,24 +110,20 @@ G_DEFINE_TYPE(ParoleConfDialog, parole_conf_dialog, G_TYPE_OBJECT)
/* Destroy the dialog */
static void
-parole_conf_dialog_destroy(GtkWidget *widget, ParoleConfDialog *self)
-{
+parole_conf_dialog_destroy(GtkWidget *widget, ParoleConfDialog *self) {
gtk_widget_hide(widget);
}
/* Change the various image properties */
-void reset_color_clicked_cb(GtkButton *button, ParoleConfDialog *self)
-{
+void reset_color_clicked_cb(GtkButton *button, ParoleConfDialog *self) {
gtk_range_set_value(GTK_RANGE(self->priv->brightness), 0);
gtk_range_set_value(GTK_RANGE(self->priv->contrast), 0);
gtk_range_set_value(GTK_RANGE(self->priv->hue), 0);
gtk_range_set_value(GTK_RANGE(self->priv->saturation), 0);
}
-void parole_conf_dialog_response_cb(GtkDialog *dialog, gint response_id, ParoleConfDialog *self)
-{
- switch (response_id)
- {
+void parole_conf_dialog_response_cb(GtkDialog *dialog, gint response_id, ParoleConfDialog *self) {
+ switch (response_id) {
case GTK_RESPONSE_HELP:
break;
default:
@@ -138,18 +133,14 @@ void parole_conf_dialog_response_cb(GtkDialog *dialog, gint response_id, ParoleC
}
/* Change subtitle encoding */
-void parole_conf_dialog_subtitle_encoding_changed_cb(GtkComboBox *widget, ParoleConfDialog *self)
-{
+void parole_conf_dialog_subtitle_encoding_changed_cb(GtkComboBox *widget, ParoleConfDialog *self) {
g_object_set(G_OBJECT(self->priv->conf),
- "subtitle-encoding", parole_subtitle_encoding_get_selected(widget),
- NULL);
+ "subtitle-encoding", parole_subtitle_encoding_get_selected(widget),
+ NULL);
}
/* Enable visualisations */
-void parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
+void parole_conf_dialog_enable_vis_changed_cb(GObject *object, GParamSpec *pspec, gpointer *data) {
gboolean active;
ParoleConfDialog *self;
self = PAROLE_CONF_DIALOG(data);
@@ -161,8 +152,7 @@ void parole_conf_dialog_enable_vis_changed_cb(GObject *object,
/* Generic function to change all image properties */
static void
-set_effect_value(ParoleConfDialog *self, GtkRange *range, const gchar *name)
-{
+set_effect_value(ParoleConfDialog *self, GtkRange *range, const gchar *name) {
gint value;
value = gtk_range_get_value(range);
@@ -173,31 +163,26 @@ set_effect_value(ParoleConfDialog *self, GtkRange *range, const gchar *name)
}
/* Change brightness */
-void brightness_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
-{
+void brightness_value_changed_cb(GtkRange *range, ParoleConfDialog *self) {
set_effect_value(self, range, "brightness");
}
/* Change contrast */
-void contrast_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
-{
+void contrast_value_changed_cb(GtkRange *range, ParoleConfDialog *self) {
set_effect_value(self, range, "contrast");
}
/* Change hue */
-void hue_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
-{
+void hue_value_changed_cb(GtkRange *range, ParoleConfDialog *self) {
set_effect_value(self, range, "hue");
}
/* Change saturation */
-void saturation_value_changed_cb(GtkRange *range, ParoleConfDialog *self)
-{
+void saturation_value_changed_cb(GtkRange *range, ParoleConfDialog *self) {
set_effect_value(self, range, "saturation");
}
-void parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget, ParoleConfDialog *self)
-{
+void parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget, ParoleConfDialog *self) {
gchar *active = NULL;
GstElementFactory *f;
@@ -211,8 +196,7 @@ void parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget, ParoleConfDi
f = g_hash_table_lookup(self->priv->vis_plugins, active);
- if ( f )
- {
+ if (f) {
g_object_set(G_OBJECT(self->priv->conf),
"vis-name", gst_object_get_name(GST_OBJECT(f)),
NULL);
@@ -221,8 +205,7 @@ void parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget, ParoleConfDi
g_free(active);
}
-void parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget, ParoleConfDialog *self)
-{
+void parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget, ParoleConfDialog *self) {
gchar *active = NULL;
GtkTreeIter iter;
@@ -233,8 +216,7 @@ void parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget, ParoleConfD
else
return;
- if (g_strcmp0(active, "other") != 0)
- {
+ if (g_strcmp0(active, "other") != 0) {
g_object_set(G_OBJECT(self->priv->conf),
"videosink", g_strdup(active),
NULL);
@@ -246,8 +228,7 @@ void parole_conf_dialog_sink_plugin_changed_cb(GtkComboBox *widget, ParoleConfD
}
/* Change subtitle font */
-void parole_conf_dialog_font_set_cb(GtkFontButton *button, ParoleConfDialog *self)
-{
+void parole_conf_dialog_font_set_cb(GtkFontButton *button, ParoleConfDialog *self) {
g_object_set(G_OBJECT(self->priv->conf),
"subtitle-font", gtk_font_button_get_font_name(button),
NULL);
@@ -255,8 +236,7 @@ void parole_conf_dialog_font_set_cb(GtkFontButton *button, ParoleConfDialog *sel
/* Finalize the dialog */
static void
-parole_conf_dialog_finalize(GObject *object)
-{
+parole_conf_dialog_finalize(GObject *object) {
ParoleConfDialog *self;
self = PAROLE_CONF_DIALOG(object);
@@ -269,8 +249,7 @@ parole_conf_dialog_finalize(GObject *object)
/* Initialize the config-dialog class */
static void
-parole_conf_dialog_class_init(ParoleConfDialogClass *klass)
-{
+parole_conf_dialog_class_init(ParoleConfDialogClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_conf_dialog_finalize;
@@ -280,8 +259,7 @@ parole_conf_dialog_class_init(ParoleConfDialogClass *klass)
/* Initialize the dialog */
static void
-parole_conf_dialog_init(ParoleConfDialog *self)
-{
+parole_conf_dialog_init(ParoleConfDialog *self) {
self->priv = PAROLE_CONF_DIALOG_GET_PRIVATE(self);
self->priv->conf = parole_conf_new();
@@ -290,8 +268,7 @@ parole_conf_dialog_init(ParoleConfDialog *self)
/* Fill the combobox with visualisations */
static void
-parole_conf_dialog_add_vis_plugins(gpointer key, gpointer value, GtkWidget *combox)
-{
+parole_conf_dialog_add_vis_plugins(gpointer key, gpointer value, GtkWidget *combox) {
GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combox)));
GtkTreeIter iter;
@@ -303,8 +280,7 @@ parole_conf_dialog_add_vis_plugins(gpointer key, gpointer value, GtkWidget *comb
#ifdef HAVE_CLUTTER
static void
-parole_conf_dialog_add_clutter_sink(ParoleConfDialog *dialog, GtkComboBox *combobox)
-{
+parole_conf_dialog_add_clutter_sink(ParoleConfDialog *dialog, GtkComboBox *combobox) {
GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)));
GtkTreeIter iter;
@@ -318,9 +294,7 @@ parole_conf_dialog_add_clutter_sink(ParoleConfDialog *dialog, GtkComboBox *combo
/* Set the combobox to the default visualisation plugin */
static gboolean
-parole_conf_dialog_set_default_vis_plugin(GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, ParoleConfDialog *self)
-{
+parole_conf_dialog_set_default_vis_plugin(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, ParoleConfDialog *self) {
GstElementFactory *f;
gchar *vis_name;
gchar *combox_text;
@@ -351,8 +325,7 @@ parole_conf_dialog_set_default_vis_plugin(GtkTreeModel *model, GtkTreePath *path
/* Set the combobox to the default sink plugin */
static gboolean
-parole_conf_dialog_set_default_sink_plugin(ParoleConfDialog *self)
-{
+parole_conf_dialog_set_default_sink_plugin(ParoleConfDialog *self) {
gchar *sink_name;
g_object_get(G_OBJECT(self->priv->conf),
@@ -378,8 +351,7 @@ parole_conf_dialog_set_default_sink_plugin(ParoleConfDialog *self)
/* Load the rest of the settings stored in the rc file */
static void
-parole_conf_dialog_set_defaults(ParoleConfDialog *self)
-{
+parole_conf_dialog_set_defaults(ParoleConfDialog *self) {
GtkTreeModel *model;
gboolean vis_enabled;
gchar *subtitle_font;
@@ -411,15 +383,13 @@ parole_conf_dialog_set_defaults(ParoleConfDialog *self)
}
ParoleConfDialog *
-parole_conf_dialog_new(void)
-{
+parole_conf_dialog_new(void) {
ParoleConfDialog *parole_conf_dialog = NULL;
parole_conf_dialog = g_object_new(PAROLE_TYPE_CONF_DIALOG, NULL);
return parole_conf_dialog;
}
-void parole_conf_dialog_open(ParoleConfDialog *self, GtkWidget *parent)
-{
+void parole_conf_dialog_open(ParoleConfDialog *self, GtkWidget *parent) {
GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *combox;
diff --git a/src/parole-conf-dialog.h b/src/parole-conf-dialog.h
index dfc2b2a..c2fa65c 100644
--- a/src/parole-conf-dialog.h
+++ b/src/parole-conf-dialog.h
@@ -34,14 +34,12 @@ G_BEGIN_DECLS
typedef struct ParoleConfDialogPrivate ParoleConfDialogPrivate;
-typedef struct
-{
+typedef struct {
GObject parent;
ParoleConfDialogPrivate *priv;
} ParoleConfDialog;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
} ParoleConfDialogClass;
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 953b41c..a6f7b32 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -43,8 +43,7 @@
static gpointer parole_conf_object = NULL;
/* Property identifiers */
-enum
-{
+enum {
PROP_0,
/* Audio */
PROP_VIS_ENABLED,
@@ -107,13 +106,11 @@ static void parole_conf_load_rc_file(ParoleConf *conf);
-struct _ParoleConfClass
-{
+struct _ParoleConfClass {
GObjectClass __parent__;
};
-struct _ParoleConf
-{
+struct _ParoleConf {
GObject __parent__;
XfconfChannel *channel;
@@ -142,10 +139,9 @@ G_DEFINE_TYPE(ParoleConf, parole_conf, G_TYPE_OBJECT)
* Write property-values to the Xfconf channel.
**/
static void parole_conf_set_property(GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec) {
ParoleConf *conf = PAROLE_CONF(object);
GValue dst = { 0, };
gchar prop_name[64];
@@ -187,8 +183,7 @@ static void parole_conf_set_property(GObject *object,
g_signal_handler_unblock(conf->channel, conf->property_changed_id);
/* now we can notify the plugins */
- switch (prop_id)
- {
+ switch (prop_id) {
/* sadly this one recurses */
case PROP_VOLUME:
break;
@@ -212,10 +207,9 @@ static void parole_conf_set_property(GObject *object,
* Read property-values from the Xfconf channel
**/
static void parole_conf_get_property(GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec) {
ParoleConf *conf = PAROLE_CONF(object);
GValue src = { 0, };
gchar prop_name[64];
@@ -223,8 +217,7 @@ static void parole_conf_get_property(GObject *object,
gchar **array;
/* only set defaults if channel is not set */
- if (G_UNLIKELY (conf->channel == NULL))
- {
+ if (G_UNLIKELY(conf->channel == NULL)) {
g_param_value_set_default(pspec, value);
return;
}
@@ -252,8 +245,7 @@ static void parole_conf_get_property(GObject *object,
}
/* Facilitate the conversion from xfconf property name to parole property name */
-gchar *parole_conf_map_xfconf_property_name(const gchar *prop_name)
-{
+gchar *parole_conf_map_xfconf_property_name(const gchar *prop_name) {
gchar *value = NULL;
if (g_strcmp0(prop_name, "/audio/visualization-enabled") == 0)
value = g_strdup("vis-enabled");
@@ -326,10 +318,9 @@ gchar *parole_conf_map_xfconf_property_name(const gchar *prop_name)
* Event handler for when a property is modified.
**/
static void parole_conf_prop_changed(XfconfChannel *channel,
- const gchar *prop_name,
- const GValue *value,
- ParoleConf *conf)
-{
+ const gchar *prop_name,
+ const GValue *value,
+ ParoleConf *conf) {
GParamSpec *pspec;
/* check if the property exists and emit change */
@@ -347,14 +338,13 @@ static void parole_conf_prop_changed(XfconfChannel *channel,
* Finalize a #ParoleConf instance.
**/
static void
-parole_conf_finalize(GObject *object)
-{
+parole_conf_finalize(GObject *object) {
ParoleConf *conf = PAROLE_CONF(object);
/* disconnect from the updates */
g_signal_handler_disconnect(conf->channel, conf->property_changed_id);
-(*G_OBJECT_CLASS(parole_conf_parent_class)->finalize)(object);
+ (*G_OBJECT_CLASS(parole_conf_parent_class)->finalize)(object);
}
/**
@@ -365,9 +355,7 @@ parole_conf_finalize(GObject *object)
* Transform a #GValue string into a #GValue boolean.
**/
static void
-transform_string_to_boolean(const GValue *src,
- GValue *dst)
-{
+transform_string_to_boolean(const GValue *src, GValue *dst) {
g_value_set_boolean(dst, !g_strcmp0(g_value_get_string(src), "TRUE"));
}
@@ -379,9 +367,7 @@ transform_string_to_boolean(const GValue *src,
* Transform a #GValue string into a #GValue int.
**/
static void
-transform_string_to_int(const GValue *src,
- GValue *dst)
-{
+transform_string_to_int(const GValue *src, GValue *dst) {
g_value_set_int(dst, strtol(g_value_get_string(src), NULL, 10));
}
@@ -393,9 +379,7 @@ transform_string_to_int(const GValue *src,
* Transform a #GValue string into a #GValue enum.
**/
static void
-transform_string_to_enum(const GValue *src,
- GValue *dst)
-{
+transform_string_to_enum(const GValue *src, GValue *dst) {
GEnumClass *genum_class;
GEnumValue *genum_value;
@@ -414,8 +398,7 @@ transform_string_to_enum(const GValue *src,
* Initialize a base #ParoleConfClass instance.
**/
static void
-parole_conf_class_init(ParoleConfClass *klass)
-{
+parole_conf_class_init(ParoleConfClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_conf_finalize;
@@ -440,12 +423,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If visualizations are enabled.
**/
g_object_class_install_property(object_class,
- PROP_VIS_ENABLED,
- g_param_spec_boolean("vis-enabled",
- "/audio/visualization-enabled",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_VIS_ENABLED,
+ g_param_spec_boolean("vis-enabled",
+ "/audio/visualization-enabled",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:vis-name:
@@ -455,12 +438,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* Name of the selected visualization.
**/
g_object_class_install_property(object_class,
- PROP_VIS_NAME,
- g_param_spec_string("vis-name",
- "/audio/visualization-name",
- NULL,
- "none",
- G_PARAM_READWRITE));
+ PROP_VIS_NAME,
+ g_param_spec_string("vis-name",
+ "/audio/visualization-name",
+ NULL,
+ "none",
+ G_PARAM_READWRITE));
/**
* ParoleConf:volume:
@@ -470,14 +453,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Audio volume level.
**/
g_object_class_install_property(object_class,
- PROP_VOLUME,
- g_param_spec_int("volume",
- "/audio/volume",
- NULL,
- 0,
- 100,
- 50,
- G_PARAM_READWRITE));
+ PROP_VOLUME,
+ g_param_spec_int("volume",
+ "/audio/volume",
+ NULL,
+ 0,
+ 100,
+ 50,
+ G_PARAM_READWRITE));
/**
* ParoleConf:media-chooser-folder:
@@ -487,12 +470,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* Path to directory containing last used media.
**/
g_object_class_install_property(object_class,
- PROP_MEDIA_CHOOSER_FOLDER,
- g_param_spec_string("media-chooser-folder",
- "/folders/last-used-media",
- NULL,
- "none",
- G_PARAM_READWRITE));
+ PROP_MEDIA_CHOOSER_FOLDER,
+ g_param_spec_string("media-chooser-folder",
+ "/folders/last-used-media",
+ NULL,
+ "none",
+ G_PARAM_READWRITE));
/**
* ParoleConf:multimedia-keys:
@@ -502,12 +485,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If multimedia keys are enabled for controlling playback.
**/
g_object_class_install_property(object_class,
- PROP_MULTIMEDIA_KEYS,
- g_param_spec_boolean("multimedia-keys",
- "/parole/multimedia-keys",
- NULL,
- TRUE,
- G_PARAM_READWRITE));
+ PROP_MULTIMEDIA_KEYS,
+ g_param_spec_boolean("multimedia-keys",
+ "/parole/multimedia-keys",
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:plugins:
@@ -517,12 +500,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* List of enabled plugins.
**/
g_object_class_install_property(object_class,
- PROP_PLUGINS,
- g_param_spec_string("plugins",
- "/parole/plugins",
- NULL,
- "none",
- G_PARAM_READWRITE));
+ PROP_PLUGINS,
+ g_param_spec_string("plugins",
+ "/parole/plugins",
+ NULL,
+ "none",
+ G_PARAM_READWRITE));
/**
* ParoleConf:scan-recursive:
@@ -532,12 +515,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If openening a directory should also open subdirectories.
**/
g_object_class_install_property(object_class,
- PROP_SCAN_FOLDER_RECURSIVELY,
- g_param_spec_boolean("scan-recursive",
- "/parole/scan-recursive",
- NULL,
- TRUE,
- G_PARAM_READWRITE));
+ PROP_SCAN_FOLDER_RECURSIVELY,
+ g_param_spec_boolean("scan-recursive",
+ "/parole/scan-recursive",
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:remember-playlist:
@@ -547,12 +530,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If the playlist should be persistent across application sessions.
**/
g_object_class_install_property(object_class,
- PROP_REMEMBER_PLAYLIST,
- g_param_spec_boolean("remember-playlist",
- "/playlist/remember-playlist",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_REMEMBER_PLAYLIST,
+ g_param_spec_boolean("remember-playlist",
+ "/playlist/remember-playlist",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:remove-duplicated:
@@ -562,12 +545,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If duplicate playlist entries should be removed from the playlist.
**/
g_object_class_install_property(object_class,
- PROP_REMOVE_DUPLICATED_PLAYLIST_ENTRIES,
- g_param_spec_boolean("remove-duplicated",
- "/playlist/remove-duplicates",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_REMOVE_DUPLICATED_PLAYLIST_ENTRIES,
+ g_param_spec_boolean("remove-duplicated",
+ "/playlist/remove-duplicates",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:repeat:
@@ -577,12 +560,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If the playlist should automatically repeat when finished.
**/
g_object_class_install_property(object_class,
- PROP_REPEAT,
- g_param_spec_boolean("repeat",
- "/playlist/repeat",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_REPEAT,
+ g_param_spec_boolean("repeat",
+ "/playlist/repeat",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:replace-playlist:
@@ -593,12 +576,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* when files are opened.
**/
g_object_class_install_property(object_class,
- PROP_REPLACE_PLAYLIST,
- g_param_spec_boolean("replace-playlist",
- "/playlist/replace-playlist",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_REPLACE_PLAYLIST,
+ g_param_spec_boolean("replace-playlist",
+ "/playlist/replace-playlist",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:showhide-playlist:
@@ -608,12 +591,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If the playlist is shown or hidden.
**/
g_object_class_install_property(object_class,
- PROP_SHOWHIDE_PLAYLIST,
- g_param_spec_boolean("showhide-playlist",
- "/playlist/show-playlist",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_SHOWHIDE_PLAYLIST,
+ g_param_spec_boolean("showhide-playlist",
+ "/playlist/show-playlist",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:shuffle:
@@ -623,12 +606,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If the playlist should be played in shuffled order.
**/
g_object_class_install_property(object_class,
- PROP_SHUFFLE,
- g_param_spec_boolean("shuffle",
- "/playlist/shuffle",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_SHUFFLE,
+ g_param_spec_boolean("shuffle",
+ "/playlist/shuffle",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:play-opened-files:
@@ -639,12 +622,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* the playlist.
**/
g_object_class_install_property(object_class,
- PROP_START_PLAYING_OPENED_FILES,
- g_param_spec_boolean("play-opened-files",
- "/playlist/play-opened-files",
- NULL,
- TRUE,
- G_PARAM_READWRITE));
+ PROP_START_PLAYING_OPENED_FILES,
+ g_param_spec_boolean("play-opened-files",
+ "/playlist/play-opened-files",
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:enable-subtitle:
@@ -654,12 +637,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If subtitles are enabled.
**/
g_object_class_install_property(object_class,
- PROP_SUBTITLE_ENABLED,
- g_param_spec_boolean("enable-subtitle",
- "/subtitles/enabled",
- NULL,
- TRUE,
- G_PARAM_READWRITE));
+ PROP_SUBTITLE_ENABLED,
+ g_param_spec_boolean("enable-subtitle",
+ "/subtitles/enabled",
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:subtitle-encoding:
@@ -669,12 +652,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* Encoding for subtitle text.
**/
g_object_class_install_property(object_class,
- PROP_SUBTITLE_ENCODING,
- g_param_spec_string("subtitle-encoding",
- "/subtitles/encoding",
- NULL,
- "UTF-8",
- G_PARAM_READWRITE));
+ PROP_SUBTITLE_ENCODING,
+ g_param_spec_string("subtitle-encoding",
+ "/subtitles/encoding",
+ NULL,
+ "UTF-8",
+ G_PARAM_READWRITE));
/**
* ParoleConf:subtitle-font:
@@ -684,12 +667,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* Name and size of the subtitle font size.
**/
g_object_class_install_property(object_class,
- PROP_SUBTITLE_FONT,
- g_param_spec_string("subtitle-font",
- "/subtitles/font",
- NULL,
- "Sans Bold 20",
- G_PARAM_READWRITE));
+ PROP_SUBTITLE_FONT,
+ g_param_spec_string("subtitle-font",
+ "/subtitles/font",
+ NULL,
+ "Sans Bold 20",
+ G_PARAM_READWRITE));
/**
* ParoleConf:videosink:
@@ -699,12 +682,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* GStreamer videosink to use for output.
**/
g_object_class_install_property(object_class,
- PROP_VIDEO_SINK,
- g_param_spec_string("videosink",
- "/video/videosink",
- NULL,
- "xvimagesink",
- G_PARAM_READWRITE));
+ PROP_VIDEO_SINK,
+ g_param_spec_string("videosink",
+ "/video/videosink",
+ NULL,
+ "xvimagesink",
+ G_PARAM_READWRITE));
/**
* ParoleConf:aspect-ratio:
@@ -714,13 +697,13 @@ parole_conf_class_init(ParoleConfClass *klass)
* Video aspect ratio.
**/
g_object_class_install_property(object_class,
- PROP_ASPECT_RATIO,
- g_param_spec_enum("aspect-ratio",
- "/video/aspect-ratio",
- NULL,
- GST_ENUM_TYPE_ASPECT_RATIO,
- PAROLE_ASPECT_RATIO_AUTO,
- G_PARAM_READWRITE));
+ PROP_ASPECT_RATIO,
+ g_param_spec_enum("aspect-ratio",
+ "/video/aspect-ratio",
+ NULL,
+ GST_ENUM_TYPE_ASPECT_RATIO,
+ PAROLE_ASPECT_RATIO_AUTO,
+ G_PARAM_READWRITE));
/**
* ParoleConf:brightness:
@@ -730,14 +713,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Video brightness level.
**/
g_object_class_install_property(object_class,
- PROP_BRIGHTNESS,
- g_param_spec_int("brightness",
- "/video/brightness",
- NULL,
- -1000,
- 1000,
- 0,
- G_PARAM_READWRITE));
+ PROP_BRIGHTNESS,
+ g_param_spec_int("brightness",
+ "/video/brightness",
+ NULL,
+ -1000,
+ 1000,
+ 0,
+ G_PARAM_READWRITE));
/**
* ParoleConf:contrast:
@@ -747,14 +730,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Video contrast level.
**/
g_object_class_install_property(object_class,
- PROP_CONTRAST,
- g_param_spec_int("contrast",
- "/video/contrast",
- NULL,
- -1000,
- 1000,
- 0,
- G_PARAM_READWRITE));
+ PROP_CONTRAST,
+ g_param_spec_int("contrast",
+ "/video/contrast",
+ NULL,
+ -1000,
+ 1000,
+ 0,
+ G_PARAM_READWRITE));
/**
* ParoleConf:reset-saver:
@@ -764,12 +747,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If screensavers should be disabled when a video is playing.
**/
g_object_class_install_property(object_class,
- PROP_DISABLE_SCREEN_SAVER,
- g_param_spec_boolean("reset-saver",
- "/video/disable-screensaver",
- NULL,
- TRUE,
- G_PARAM_READWRITE));
+ PROP_DISABLE_SCREEN_SAVER,
+ g_param_spec_boolean("reset-saver",
+ "/video/disable-screensaver",
+ NULL,
+ TRUE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:hue:
@@ -779,14 +762,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Video hue level.
**/
g_object_class_install_property(object_class,
- PROP_HUE,
- g_param_spec_int("hue",
- "/video/hue",
- NULL,
- -1000,
- 1000,
- 0,
- G_PARAM_READWRITE));
+ PROP_HUE,
+ g_param_spec_int("hue",
+ "/video/hue",
+ NULL,
+ -1000,
+ 1000,
+ 0,
+ G_PARAM_READWRITE));
/**
* ParoleConf:saturation:
@@ -796,14 +779,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Video saturation level.
**/
g_object_class_install_property(object_class,
- PROP_SATURATION,
- g_param_spec_int("saturation",
- "/video/saturation",
- NULL,
- -1000,
- 1000,
- 0,
- G_PARAM_READWRITE));
+ PROP_SATURATION,
+ g_param_spec_int("saturation",
+ "/video/saturation",
+ NULL,
+ -1000,
+ 1000,
+ 0,
+ G_PARAM_READWRITE));
/**
* ParoleConf:window-height:
@@ -813,14 +796,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Saved height of the application window.
**/
g_object_class_install_property(object_class,
- PROP_WINDOW_HEIGHT,
- g_param_spec_int("window-height",
- "/window/height",
- NULL,
- 1,
- G_MAXINT16,
- 420,
- G_PARAM_READWRITE));
+ PROP_WINDOW_HEIGHT,
+ g_param_spec_int("window-height",
+ "/window/height",
+ NULL,
+ 1,
+ G_MAXINT16,
+ 420,
+ G_PARAM_READWRITE));
/**
* ParoleConf:minimized:
@@ -830,12 +813,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If Parole should start minimized.
**/
g_object_class_install_property(object_class,
- PROP_WINDOW_MINIMIZED,
- g_param_spec_boolean("minimized",
- "/window/minimized",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_WINDOW_MINIMIZED,
+ g_param_spec_boolean("minimized",
+ "/window/minimized",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:maximized:
@@ -845,12 +828,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* If Parole should start maximized.
**/
g_object_class_install_property(object_class,
- PROP_WINDOW_MINIMIZED,
- g_param_spec_boolean("window-maximized",
- "/window/maximized",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_WINDOW_MINIMIZED,
+ g_param_spec_boolean("window-maximized",
+ "/window/maximized",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
/**
* ParoleConf:window-width:
@@ -860,14 +843,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Saved width of the application window.
**/
g_object_class_install_property(object_class,
- PROP_WINDOW_WIDTH,
- g_param_spec_int("window-width",
- "/window/width",
- NULL,
- 1,
- G_MAXINT16,
- 760,
- G_PARAM_READWRITE));
+ PROP_WINDOW_WIDTH,
+ g_param_spec_int("window-width",
+ "/window/width",
+ NULL,
+ 1,
+ G_MAXINT16,
+ 760,
+ G_PARAM_READWRITE));
/**
* ParoleConf:hide-controls-timeout:
@@ -877,14 +860,14 @@ parole_conf_class_init(ParoleConfClass *klass)
* Control the timeout for the playback controls to hide.
**/
g_object_class_install_property(object_class,
- PROP_HIDE_CONTROLS_TIMEOUT,
- g_param_spec_int("hide-controls-timeout",
- "/hide-controls-timeout",
- NULL,
- 1,
- G_MAXINT16,
- 4,
- G_PARAM_READWRITE));
+ PROP_HIDE_CONTROLS_TIMEOUT,
+ g_param_spec_int("hide-controls-timeout",
+ "/hide-controls-timeout",
+ NULL,
+ 1,
+ G_MAXINT16,
+ 4,
+ G_PARAM_READWRITE));
/**
* ParoleConf:always-hide-menubar:
@@ -894,12 +877,12 @@ parole_conf_class_init(ParoleConfClass *klass)
* Persistently hide the menubar.
**/
g_object_class_install_property(object_class,
- PROP_ALWAYS_HIDE_MENUBAR,
- g_param_spec_boolean("always-hide-menubar",
- "/always-hide-menubar",
- NULL,
- FALSE,
- G_PARAM_READWRITE));
+ PROP_ALWAYS_HIDE_MENUBAR,
+ g_param_spec_boolean("always-hide-menubar",
+ "/always-hide-menubar",
+ NULL,
+ FALSE,
+ G_PARAM_READWRITE));
}
/**
@@ -910,8 +893,7 @@ parole_conf_class_init(ParoleConfClass *klass)
* existing settings into Xfconf and the rc file will no longer be needed.
**/
static void
-parole_conf_load_rc_file(ParoleConf *conf)
-{
+parole_conf_load_rc_file(ParoleConf *conf) {
GParamSpec **pspecs;
GParamSpec *pspec;
XfceRc *rc;
@@ -926,8 +908,7 @@ parole_conf_load_rc_file(ParoleConf *conf)
rc = parole_get_resource_file(PAROLE_RC_GROUP_GENERAL, TRUE);
/* Check whether rc file exists */
- if (G_UNLIKELY (rc == NULL))
- {
+ if (G_UNLIKELY(rc == NULL)) {
g_debug("Unable to lookup rc file in : %s\n", PAROLE_RESOURCE_FILE);
return;
}
@@ -937,8 +918,7 @@ parole_conf_load_rc_file(ParoleConf *conf)
pspecs = g_object_class_list_properties(G_OBJECT_GET_CLASS(conf), &nspecs);
/* Load each property */
- for (n = 0; n < nspecs; ++n)
- {
+ for (n = 0; n < nspecs; ++n) {
pspec = pspecs[n];
/* continue if the nick is null */
@@ -991,8 +971,7 @@ parole_conf_load_rc_file(ParoleConf *conf)
* Initialize a #ParoleConf instance.
**/
static void
-parole_conf_init(ParoleConf *conf)
-{
+parole_conf_init(ParoleConf *conf) {
const gchar check_prop[] = "/subtitles/font";
/* don't set a channel if xfconf init failed */
@@ -1003,8 +982,7 @@ parole_conf_init(ParoleConf *conf)
conf->channel = xfconf_channel_get("parole");
/* check one of the property to see if there are values */
- if (!xfconf_channel_has_property (conf->channel, check_prop))
- {
+ if (!xfconf_channel_has_property(conf->channel, check_prop)) {
/* try to load the old config file */
parole_conf_load_rc_file(conf);
@@ -1024,8 +1002,7 @@ parole_conf_init(ParoleConf *conf)
* Create a new #ParoleConf instance.
**/
ParoleConf *
-parole_conf_new(void)
-{
+parole_conf_new(void) {
if ( parole_conf_object != NULL ) {
g_object_ref(parole_conf_object);
} else {
@@ -1044,31 +1021,26 @@ parole_conf_new(void)
* Return a boolean value from a property.
**/
gboolean
-parole_conf_get_property_bool(ParoleConf *conf,
- const gchar *name)
-{
+parole_conf_get_property_bool(ParoleConf *conf, const gchar *name) {
gboolean value;
g_object_get(G_OBJECT(conf),
- name, &value,
- NULL);
+ name, &value,
+ NULL);
return value;
}
void
-parole_conf_write_entry_list(ParoleConf *conf, const gchar *name, gchar **value)
-{
+parole_conf_write_entry_list(ParoleConf *conf, const gchar *name, gchar **value) {
gchar *value_string = "";
guint num = 0, i, count = 0;
TRACE("START");
num = g_strv_length(value);
- for ( i = 0; i < num; i++ )
- {
- if (value[i] && g_strcmp0(value[i], "") != 0 && g_strcmp0(value[i], "none") != 0 )
- {
+ for ( i = 0; i < num; i++ ) {
+ if (value[i] && g_strcmp0(value[i], "") != 0 && g_strcmp0(value[i], "none") != 0) {
if (count == 0)
value_string = g_strdup(value[i]);
else
@@ -1086,8 +1058,7 @@ parole_conf_write_entry_list(ParoleConf *conf, const gchar *name, gchar **value)
}
gchar**
-parole_conf_read_entry_list(ParoleConf *conf, const gchar *name)
-{
+parole_conf_read_entry_list(ParoleConf *conf, const gchar *name) {
gchar *value_string;
gchar **ret_val = NULL;
@@ -1108,7 +1079,6 @@ parole_conf_read_entry_list(ParoleConf *conf, const gchar *name)
void
-parole_conf_xfconf_init_failed(void)
-{
+parole_conf_xfconf_init_failed(void) {
no_xfconf = TRUE;
}
diff --git a/src/parole-disc.c b/src/parole-disc.c
index 0119f5d..fda0122 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -51,8 +51,7 @@ static void parole_disc_finalize(GObject *object);
#define PAROLE_DISC_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_DISC, ParoleDiscPrivate))
-struct ParoleDiscPrivate
-{
+struct ParoleDiscPrivate {
GVolumeMonitor *monitor;
GPtrArray *array;
@@ -61,8 +60,7 @@ struct ParoleDiscPrivate
gboolean needs_update;
};
-enum
-{
+enum {
DISC_SELECTED,
LABEL_CHANGED,
LAST_SIGNAL
@@ -72,8 +70,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE(ParoleDisc, parole_disc, G_TYPE_OBJECT)
-typedef struct
-{
+typedef struct {
GtkWidget *mi;
gchar *uri;
gchar *device;
@@ -87,8 +84,7 @@ typedef struct
* Free the mount-point.
**/
static void
-free_mount_data(gpointer data)
-{
+free_mount_data(gpointer data) {
MountData *mount;
mount = (MountData *) data;
@@ -104,8 +100,7 @@ free_mount_data(gpointer data)
static void
-parole_disc_set_label(ParoleDisc *disc, const gchar *label)
-{
+parole_disc_set_label(ParoleDisc *disc, const gchar *label) {
gchar *menu_label;
if ( g_strcmp0(label, _("Insert Disc")) != 0 ) {
@@ -121,21 +116,18 @@ parole_disc_set_label(ParoleDisc *disc, const gchar *label)
}
static void
-parole_disc_set_enabled(ParoleDisc *disc, gboolean enabled)
-{
+parole_disc_set_enabled(ParoleDisc *disc, gboolean enabled) {
gtk_widget_set_sensitive(GTK_WIDGET(disc->priv->disc_menu_item), enabled);
// g_signal_emit (G_OBJECT (disc), signals[DVD_ENABLED], 0, enabled);
}
static gboolean
-parole_disc_get_enabled(ParoleDisc *disc)
-{
+parole_disc_get_enabled(ParoleDisc *disc) {
return gtk_widget_get_sensitive( GTK_WIDGET(disc->priv->disc_menu_item) );
}
static void
-parole_disc_set_kind(ParoleDisc *disc, ParoleDiscKind kind)
-{
+parole_disc_set_kind(ParoleDisc *disc, ParoleDiscKind kind) {
gboolean enabled = TRUE;
switch (kind) {
@@ -163,8 +155,7 @@ parole_disc_set_kind(ParoleDisc *disc, ParoleDiscKind kind)
* Callback function for when the CD/DVD menu item is activated.
**/
static void
-parole_disc_media_activate_cb(GtkWidget *widget, ParoleDisc *disc)
-{
+parole_disc_media_activate_cb(GtkWidget *widget, ParoleDisc *disc) {
MountData *data;
data = g_object_get_data(G_OBJECT(widget), "mount-data");
@@ -182,8 +173,7 @@ parole_disc_media_activate_cb(GtkWidget *widget, ParoleDisc *disc)
* disc is detected.
**/
static void
-parole_disc_show_menu_item(ParoleDisc *disc, MountData *data, const gchar *label)
-{
+parole_disc_show_menu_item(ParoleDisc *disc, MountData *data, const gchar *label) {
parole_disc_set_kind(disc, data->kind);
parole_disc_set_label(disc, label);
@@ -209,10 +199,9 @@ parole_disc_show_menu_item(ParoleDisc *disc, MountData *data, const gchar *label
**/
static MountData *
parole_disc_get_mount_data(ParoleDisc *disc,
- const gchar *uri,
- const gchar *device,
- ParoleDiscKind kind)
-{
+ const gchar *uri,
+ const gchar *device,
+ ParoleDiscKind kind) {
MountData *data;
data = g_new0(MountData, 1);
@@ -234,8 +223,7 @@ parole_disc_get_mount_data(ParoleDisc *disc,
* Add the mounted disc to the "Media" menu.
**/
static void
-parole_disc_add_mount_to_menu(ParoleDisc *disc, GMount *mount, const gchar *device)
-{
+parole_disc_add_mount_to_menu(ParoleDisc *disc, GMount *mount, const gchar *device) {
GFile *file;
gchar **content_type;
guint i;
@@ -244,15 +232,13 @@ parole_disc_add_mount_to_menu(ParoleDisc *disc, GMount *mount, const gchar *devi
file = g_mount_get_root(mount);
- if ( g_file_has_uri_scheme (file, "cdda") )
- {
+ if (g_file_has_uri_scheme(file, "cdda")) {
kind = PAROLE_DISC_CDDA;
uri = g_strdup("cdda://");
goto got_cdda;
}
- if ( g_file_has_uri_scheme (file, "dvd") )
- {
+ if (g_file_has_uri_scheme(file, "dvd")) {
kind = PAROLE_DISC_DVD;
uri = g_strdup("dvd:/");
goto got_cdda;
@@ -261,8 +247,7 @@ parole_disc_add_mount_to_menu(ParoleDisc *disc, GMount *mount, const gchar *devi
content_type = g_content_type_guess_for_tree(file);
/* Determine the type of disc */
- for ( i = 0; content_type && content_type[i]; i++)
- {
+ for (i = 0; content_type && content_type[i]; i++) {
TRACE("Checking disc content type : %s", content_type[i]);
if ( !g_strcmp0(content_type[i], "x-content/video-dvd") ) {
@@ -288,8 +273,7 @@ parole_disc_add_mount_to_menu(ParoleDisc *disc, GMount *mount, const gchar *devi
g_strfreev(content_type);
got_cdda:
- if ( kind != PAROLE_DISC_UNKNOWN )
- {
+ if ( kind != PAROLE_DISC_UNKNOWN ) {
MountData *data;
gchar *name;
@@ -317,8 +301,7 @@ got_cdda:
* Check the state of the drive.
**/
static void
-parole_disc_check_cdrom(ParoleDisc *disc, GVolume *volume, const gchar *device)
-{
+parole_disc_check_cdrom(ParoleDisc *disc, GVolume *volume, const gchar *device) {
#if defined(__linux__)
gint fd;
gint drive;
@@ -329,8 +312,7 @@ parole_disc_check_cdrom(ParoleDisc *disc, GVolume *volume, const gchar *device)
TRACE("device : %s", device);
- if ( (fd = open (device, O_RDONLY)) < 0 )
- {
+ if ((fd = open(device, O_RDONLY)) < 0) {
g_debug("Failed to open device : %s", device);
disc->priv->needs_update = TRUE;
goto out;
@@ -369,8 +351,7 @@ out:
* Add the disc drive to the menu.
**/
static void
-parole_disc_add_drive(ParoleDisc *disc, GDrive *drive, const gchar *device)
-{
+parole_disc_add_drive(ParoleDisc *disc, GDrive *drive, const gchar *device) {
GList *list;
guint len;
guint i;
@@ -378,8 +359,7 @@ parole_disc_add_drive(ParoleDisc *disc, GDrive *drive, const gchar *device)
list = g_drive_get_volumes(drive);
len = g_list_length(list);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
GVolume *volume;
GMount *mount;
@@ -408,8 +388,7 @@ parole_disc_add_drive(ParoleDisc *disc, GDrive *drive, const gchar *device)
* Get the list of available drives and attempt to add each to the menu.
**/
static void
-parole_disc_get_drives(ParoleDisc *disc)
-{
+parole_disc_get_drives(ParoleDisc *disc) {
GList *list;
guint len;
guint i;
@@ -424,16 +403,14 @@ parole_disc_get_drives(ParoleDisc *disc)
*/
disc->priv->needs_update = FALSE;
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
GDrive *drive;
gchar *device = NULL;
drive = g_list_nth_data(list, i);
/* FIXME what happens if there is more than one disc drive? */
- if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
- {
+ if (g_drive_can_eject(drive) && g_drive_has_media(drive)) {
device = g_drive_get_identifier(drive, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
parole_disc_add_drive(disc, drive, device);
if ( device )
@@ -454,8 +431,7 @@ parole_disc_get_drives(ParoleDisc *disc)
* needed, perform it when the menu item is activated.
**/
static void
-parole_disc_select_cb(GtkMenuItem *item, ParoleDisc *disc)
-{
+parole_disc_select_cb(GtkMenuItem *item, ParoleDisc *disc) {
if ( disc->priv->needs_update )
parole_disc_get_drives(disc);
}
@@ -470,8 +446,7 @@ parole_disc_select_cb(GtkMenuItem *item, ParoleDisc *disc)
* to blank and tell the #ParoleDisc to check for updates.
**/
static void
-parole_disc_monitor_changed_cb(GVolumeMonitor *monitor, gpointer *device, ParoleDisc *disc)
-{
+parole_disc_monitor_changed_cb(GVolumeMonitor *monitor, gpointer *device, ParoleDisc *disc) {
parole_disc_set_kind(disc, PAROLE_DISC_UNKNOWN);
disc->priv->needs_update = TRUE;
@@ -484,8 +459,7 @@ parole_disc_monitor_changed_cb(GVolumeMonitor *monitor, gpointer *device, Parole
* Initialize the #ParoleDiscClass.
**/
static void
-parole_disc_class_init(ParoleDiscClass *klass)
-{
+parole_disc_class_init(ParoleDiscClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
signals[DISC_SELECTED] =
@@ -519,8 +493,7 @@ parole_disc_class_init(ParoleDiscClass *klass)
* Initialize the disc monitor.
**/
static void
-parole_disc_init(ParoleDisc *disc)
-{
+parole_disc_init(ParoleDisc *disc) {
GtkBuilder *builder;
disc->priv = PAROLE_DISC_GET_PRIVATE(disc);
@@ -566,8 +539,7 @@ parole_disc_init(ParoleDisc *disc)
* Finalize a #ParoleDisc object.
**/
static void
-parole_disc_finalize(GObject *object)
-{
+parole_disc_finalize(GObject *object) {
ParoleDisc *disc;
disc = PAROLE_DISC(object);
@@ -586,8 +558,7 @@ parole_disc_finalize(GObject *object)
* Create a new #ParoleDisc instance.
**/
ParoleDisc *
-parole_disc_new(void)
-{
+parole_disc_new(void) {
ParoleDisc *disc = NULL;
disc = g_object_new(PAROLE_TYPE_DISC, NULL);
return disc;
diff --git a/src/parole-disc.h b/src/parole-disc.h
index 1b118d3..f9bc672 100644
--- a/src/parole-disc.h
+++ b/src/parole-disc.h
@@ -33,8 +33,7 @@ G_BEGIN_DECLS
typedef struct ParoleDiscPrivate ParoleDiscPrivate;
-typedef enum
-{
+typedef enum {
PAROLE_DISC_UNKNOWN,
PAROLE_DISC_CDDA,
PAROLE_DISC_VCD,
@@ -42,14 +41,12 @@ typedef enum
PAROLE_DISC_DVD
} ParoleDiscKind;
-typedef struct
-{
+typedef struct {
GObject parent;
ParoleDiscPrivate *priv;
} ParoleDisc;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
void (*disc_selected) (ParoleDisc *disc,
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index 156d5e9..e4b0a73 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -61,8 +61,7 @@ void media_chooser_folder_changed_cb(GtkWidget *widget,
void media_chooser_file_activate_cb(GtkFileChooser *filechooser,
ParoleMediaChooser *chooser);
-struct ParoleMediaChooser
-{
+struct ParoleMediaChooser {
GObject parent;
ParoleConf *conf;
@@ -70,8 +69,7 @@ struct ParoleMediaChooser
GtkWidget *spinner;
};
-struct ParoleMediaChooserClass
-{
+struct ParoleMediaChooserClass {
GObjectClass parent_class;
void(*media_files_opened)(ParoleMediaChooser *chooser,
@@ -81,8 +79,7 @@ struct ParoleMediaChooserClass
gchar *filename);
};
-enum
-{
+enum {
MEDIA_FILES_OPENED,
ISO_OPENED,
LAST_SIGNAL
@@ -93,24 +90,21 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE(ParoleMediaChooser, parole_media_chooser, G_TYPE_OBJECT)
void
-media_chooser_folder_changed_cb(GtkWidget *widget, ParoleMediaChooser *chooser)
-{
+media_chooser_folder_changed_cb(GtkWidget *widget, ParoleMediaChooser *chooser) {
gchar *folder;
folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
- if ( folder )
- {
+ if ( folder ) {
g_object_set(G_OBJECT(chooser->conf),
- "media-chooser-folder", folder,
- NULL);
+ "media-chooser-folder", folder,
+ NULL);
g_free(folder);
}
}
/* Add one or more files from the filechooser-widget to the playlist */
static void
-parole_media_chooser_add(ParoleMediaChooser *chooser, GtkWidget *file_chooser)
-{
+parole_media_chooser_add(ParoleMediaChooser *chooser, GtkWidget *file_chooser) {
GSList *media_files = NULL;
GSList *files;
GtkFileFilter *filter;
@@ -131,11 +125,9 @@ parole_media_chooser_add(ParoleMediaChooser *chooser, GtkWidget *file_chooser)
len = g_slist_length(files);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
file = g_slist_nth_data(files, i);
- if (g_str_has_suffix(file, ".iso"))
- {
+ if (g_str_has_suffix(file, ".iso")) {
// FIXME: Is there some way to add the ISO to the playlist?
// For now we will play the ISO if it is the first file found, otherwise ignore.
if (g_slist_length(media_files) != 0)
@@ -160,8 +152,7 @@ parole_media_chooser_add(ParoleMediaChooser *chooser, GtkWidget *file_chooser)
}
static gboolean
-parole_media_chooser_add_idle(gpointer data)
-{
+parole_media_chooser_add_idle(gpointer data) {
ParoleMediaChooser *chooser;
GtkWidget *file_chooser;
@@ -177,8 +168,7 @@ parole_media_chooser_add_idle(gpointer data)
}
static void
-parole_media_chooser_open(ParoleMediaChooser *chooser)
-{
+parole_media_chooser_open(ParoleMediaChooser *chooser) {
parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(chooser->window)));
gtk_widget_show(chooser->spinner);
@@ -186,30 +176,25 @@ parole_media_chooser_open(ParoleMediaChooser *chooser)
g_idle_add((GSourceFunc) parole_media_chooser_add_idle, chooser);
}
-void parole_media_chooser_add_clicked(GtkWidget *widget, ParoleMediaChooser *chooser)
-{
+void parole_media_chooser_add_clicked(GtkWidget *widget, ParoleMediaChooser *chooser) {
parole_media_chooser_open(chooser);
}
/* Destroy the widget when close is clicked */
-void parole_media_chooser_close_clicked(GtkWidget *widget, ParoleMediaChooser *chooser)
-{
+void parole_media_chooser_close_clicked(GtkWidget *widget, ParoleMediaChooser *chooser) {
gtk_widget_destroy(chooser->window);
}
-void parole_media_chooser_destroy_cb(GtkWidget *widget, ParoleMediaChooser *chooser)
-{
+void parole_media_chooser_destroy_cb(GtkWidget *widget, ParoleMediaChooser *chooser) {
g_object_unref(chooser);
}
-void media_chooser_file_activate_cb(GtkFileChooser *filechooser, ParoleMediaChooser *chooser)
-{
+void media_chooser_file_activate_cb(GtkFileChooser *filechooser, ParoleMediaChooser *chooser) {
parole_media_chooser_open(chooser);
}
static void
-parole_media_chooser_open_internal(ParoleMediaChooser *media_chooser)
-{
+parole_media_chooser_open_internal(ParoleMediaChooser *media_chooser) {
GtkWidget *file_chooser;
GtkBuilder *builder;
GtkWidget *recursive;
@@ -249,8 +234,8 @@ parole_media_chooser_open_internal(ParoleMediaChooser *media_chooser)
/* Set the folder that is shown */
g_object_get(G_OBJECT(media_chooser->conf),
- "media-chooser-folder", &folder,
- NULL);
+ "media-chooser-folder", &folder,
+ NULL);
if ( folder )
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), folder);
@@ -259,10 +244,10 @@ parole_media_chooser_open_internal(ParoleMediaChooser *media_chooser)
/* Get playlist-properties to load files accordingly */
g_object_get(G_OBJECT(media_chooser->conf),
- "scan-recursive", &scan_recursive,
- "replace-playlist", &replace_playlist,
- "play-opened-files", &play,
- NULL);
+ "scan-recursive", &scan_recursive,
+ "replace-playlist", &replace_playlist,
+ "play-opened-files", &play,
+ NULL);
recursive = GTK_WIDGET(gtk_builder_get_object(builder, "recursive"));
@@ -275,8 +260,7 @@ parole_media_chooser_open_internal(ParoleMediaChooser *media_chooser)
}
static void
-parole_media_chooser_finalize(GObject *object)
-{
+parole_media_chooser_finalize(GObject *object) {
ParoleMediaChooser *chooser;
chooser = PAROLE_MEDIA_CHOOSER(object);
@@ -290,41 +274,38 @@ parole_media_chooser_finalize(GObject *object)
}
static void
-parole_media_chooser_class_init(ParoleMediaChooserClass *klass)
-{
+parole_media_chooser_class_init(ParoleMediaChooserClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
signals[MEDIA_FILES_OPENED] =
g_signal_new("media-files-opened",
- PAROLE_TYPE_MEDIA_CHOOSER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(ParoleMediaChooserClass, media_files_opened),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
+ PAROLE_TYPE_MEDIA_CHOOSER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(ParoleMediaChooserClass, media_files_opened),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1,
+ G_TYPE_POINTER);
signals[ISO_OPENED] =
g_signal_new("iso-opened",
- PAROLE_TYPE_MEDIA_CHOOSER,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(ParoleMediaChooserClass, iso_opened),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
+ PAROLE_TYPE_MEDIA_CHOOSER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(ParoleMediaChooserClass, iso_opened),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1,
+ G_TYPE_POINTER);
object_class->finalize = parole_media_chooser_finalize;
}
static void
-parole_media_chooser_init(ParoleMediaChooser *chooser)
-{
+parole_media_chooser_init(ParoleMediaChooser *chooser) {
chooser->conf = parole_conf_new();
}
-ParoleMediaChooser *parole_media_chooser_open_local(GtkWidget *parent)
-{
+ParoleMediaChooser *parole_media_chooser_open_local(GtkWidget *parent) {
ParoleMediaChooser *chooser;
chooser = g_object_new(PAROLE_TYPE_MEDIA_CHOOSER, NULL);
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index dd354ab..eb03c1e 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -59,8 +59,7 @@
#define PAROLE_AUTO_SAVED_PLAYLIST "xfce4/parole/auto-saved-playlist.m3u"
-typedef struct
-{
+typedef struct {
GtkWidget *chooser;
GtkTreeSelection *sel;
ParoleMediaList *list;
@@ -68,8 +67,7 @@ typedef struct
} ParolePlaylistSave;
/* Playlist filetypes */
-static struct
-{
+static struct {
ParolePlFormat format;
gchar * ext;
} playlist_format_map[] = {
@@ -80,8 +78,7 @@ static struct
{ PAROLE_PL_FORMAT_XSPF, ".xspf" }
};
-static GtkTargetEntry target_entry[] =
-{
+static GtkTargetEntry target_entry[] = {
{ "STRING", 0, 0 },
{ "text/uri-list", 0, 1 },
};
@@ -161,8 +158,7 @@ gboolean parole_media_list_query_tooltip(GtkWidget *widget,
#define PAROLE_MEDIA_LIST_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_MEDIA_LIST, ParoleMediaListPrivate))
-struct ParoleMediaListPrivate
-{
+struct ParoleMediaListPrivate {
DBusGConnection *bus;
ParoleConf *conf;
GtkWidget *view, *disc_view;
@@ -189,8 +185,7 @@ struct ParoleMediaListPrivate
gint n_shuffled_items;
};
-enum
-{
+enum {
MEDIA_ACTIVATED,
MEDIA_CURSOR_CHANGED,
URI_OPENED,
@@ -204,15 +199,13 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE(ParoleMediaList, parole_media_list, GTK_TYPE_BOX)
static void
-parole_media_list_set_widget_sensitive(ParoleMediaList *list, gboolean sensitive)
-{
+parole_media_list_set_widget_sensitive(ParoleMediaList *list, gboolean sensitive) {
gtk_widget_set_sensitive(GTK_WIDGET(list->priv->remove_button), sensitive);
gtk_widget_set_sensitive(GTK_WIDGET(list->priv->clear_button), sensitive);
}
static void
-parole_media_list_set_playlist_count(ParoleMediaList *list, gint n_items)
-{
+parole_media_list_set_playlist_count(ParoleMediaList *list, gint n_items) {
/* Toggle sensitivity based on playlist count */
parole_media_list_set_widget_sensitive(list, n_items != 0);
gtk_widget_set_sensitive(list->priv->remove_button, n_items != 0);
@@ -234,8 +227,7 @@ parole_media_list_set_playlist_count(ParoleMediaList *list, gint n_items)
}
gint
-parole_media_list_get_playlist_count(ParoleMediaList *list)
-{
+parole_media_list_get_playlist_count(ParoleMediaList *list) {
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
return gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
} else {
@@ -256,8 +248,7 @@ parole_media_list_get_playlist_count(ParoleMediaList *list)
* start playing the added file.
**/
static void
-parole_media_list_add(ParoleMediaList *list, ParoleFile *file, gboolean disc, gboolean emit, gboolean select_row)
-{
+parole_media_list_add(ParoleMediaList *list, ParoleFile *file, gboolean disc, gboolean emit, gboolean select_row) {
GtkListStore *list_store;
GtkTreePath *path;
GtkTreeRowReference *row;
@@ -281,24 +272,20 @@ parole_media_list_add(ParoleMediaList *list, ParoleFile *file, gboolean disc, gb
/* Remove duplicates functionality. If the file being added is already in the
* playlist, remove it from its current position in the playlist before
* adding it again. */
- if (!disc && remove_duplicates && gtk_tree_model_iter_n_children (GTK_TREE_MODEL(list_store), NULL) != 0)
- {
+ if (!disc && remove_duplicates && gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list_store), NULL) != 0) {
filename = g_strdup(parole_file_get_file_name(file));
/* Check the first row */
- if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter))
- {
+ if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), &iter)) {
gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL, &row_file, -1);
- if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
- {
+ if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0) {
gtk_list_store_remove(GTK_LIST_STORE(list_store), &iter);
}
/* Check subsequent rows */
while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), &iter)) {
gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter, DATA_COL, &row_file, -1);
- if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
- {
+ if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0) {
gtk_list_store_remove(GTK_LIST_STORE(list_store), &iter);
}
}
@@ -310,15 +297,14 @@ parole_media_list_add(ParoleMediaList *list, ParoleFile *file, gboolean disc, gb
/* Add the file to the playlist */
gtk_list_store_append(list_store, &iter);
gtk_list_store_set(list_store,
- &iter,
- NAME_COL, parole_file_get_display_name(file),
- DATA_COL, file,
- LENGTH_COL, parole_taglibc_get_media_length(file),
- STATE_COL, PAROLE_MEDIA_STATE_NONE,
- -1);
-
- if ( emit || select_row )
- {
+ &iter,
+ NAME_COL, parole_file_get_display_name(file),
+ DATA_COL, file,
+ LENGTH_COL, parole_taglibc_get_media_length(file),
+ STATE_COL, PAROLE_MEDIA_STATE_NONE,
+ -1);
+
+ if ( emit || select_row ) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(list_store), &iter);
row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list_store), path);
if ( select_row )
@@ -349,16 +335,15 @@ parole_media_list_add(ParoleMediaList *list, ParoleFile *file, gboolean disc, gb
*
**/
static void
-parole_media_list_files_open(ParoleMediaList *list, GSList *files, gboolean disc, gboolean emit)
-{
+parole_media_list_files_open(ParoleMediaList *list, GSList *files, gboolean disc, gboolean emit) {
ParoleFile *file;
gboolean replace;
guint len;
guint i;
g_object_get(G_OBJECT(list->priv->conf),
- "replace-playlist", &replace,
- NULL);
+ "replace-playlist", &replace,
+ NULL);
len = g_slist_length(files);
TRACE("Adding %i files", len);
@@ -366,30 +351,26 @@ parole_media_list_files_open(ParoleMediaList *list, GSList *files, gboolean disc
if ( len > 1 && !disc )
g_signal_emit(G_OBJECT(list), signals[SHOW_PLAYLIST], 0, TRUE);
- if ( len != 0 )
- {
+ if ( len != 0 ) {
if ( replace )
parole_media_list_clear_list(list);
file = g_slist_nth_data(files, 0);
parole_media_list_add(list, file, disc, emit, TRUE);
}
- for ( i = 1; i < len; i++)
- {
+ for (i = 1; i < len; i++) {
file = g_slist_nth_data(files, i);
parole_media_list_add(list, file, disc, FALSE, FALSE);
}
}
void
-parole_media_list_add_cdda_tracks(ParoleMediaList *list, gint n_tracks)
-{
+parole_media_list_add_cdda_tracks(ParoleMediaList *list, gint n_tracks) {
GSList *files = NULL;
ParoleFile *file;
int i;
- for (i = 0; i < n_tracks; i++)
- {
+ for (i = 0; i < n_tracks; i++) {
file = parole_file_new_cdda_track(i+1, g_strdup_printf(_("Track %i"), i+1));
files = g_slist_append(files, file);
}
@@ -398,14 +379,12 @@ parole_media_list_add_cdda_tracks(ParoleMediaList *list, gint n_tracks)
}
void
-parole_media_list_add_dvd_chapters(ParoleMediaList *list, gint n_chapters)
-{
+parole_media_list_add_dvd_chapters(ParoleMediaList *list, gint n_chapters) {
GSList *files = NULL;
ParoleFile *file;
gint i;
- for (i = 0; i < n_chapters; i++)
- {
+ for (i = 0; i < n_chapters; i++) {
file = PAROLE_FILE(parole_file_new_dvd_chapter(i+1, g_strdup_printf(_("Chapter %i"), i+1)));
files = g_slist_append(files, file);
}
@@ -416,10 +395,7 @@ parole_media_list_add_dvd_chapters(ParoleMediaList *list, gint n_chapters)
/* Callback to determine whether opened files should start playing immediately */
static void
-parole_media_list_files_opened_cb(ParoleMediaChooser *chooser,
- GSList *files,
- ParoleMediaList *list)
-{
+parole_media_list_files_opened_cb(ParoleMediaChooser *chooser, GSList *files, ParoleMediaList *list) {
gboolean play;
g_object_get(G_OBJECT(list->priv->conf),
@@ -430,8 +406,7 @@ parole_media_list_files_opened_cb(ParoleMediaChooser *chooser,
}
void
-parole_media_list_open_uri(ParoleMediaList *list, const gchar *uri)
-{
+parole_media_list_open_uri(ParoleMediaList *list, const gchar *uri) {
ParoleFile *file;
if ( parole_is_uri_disc(uri) ) {
@@ -443,24 +418,19 @@ parole_media_list_open_uri(ParoleMediaList *list, const gchar *uri)
}
static void
-parole_media_list_location_opened_cb(ParoleOpenLocation *obj, const gchar *location, ParoleMediaList *list)
-{
+parole_media_list_location_opened_cb(ParoleOpenLocation *obj, const gchar *location, ParoleMediaList *list) {
parole_media_list_open_uri(list, location);
}
static void
-parole_media_list_iso_opened_cb(ParoleMediaChooser *chooser,
- gchar *filename,
- ParoleMediaList *list)
-{
+parole_media_list_iso_opened_cb(ParoleMediaChooser *chooser, gchar *filename, ParoleMediaList *list) {
gchar *uri;
uri = g_strdup_printf("dvd://%s", filename);
g_signal_emit(G_OBJECT(list), signals[ISO_OPENED], 0, uri);
}
static void
-parole_media_list_open_internal(ParoleMediaList *list)
-{
+parole_media_list_open_internal(ParoleMediaList *list) {
ParoleMediaChooser *chooser;
TRACE("start");
@@ -468,21 +438,20 @@ parole_media_list_open_internal(ParoleMediaList *list)
chooser = parole_media_chooser_open_local(gtk_widget_get_toplevel(GTK_WIDGET(list)));
g_signal_connect(G_OBJECT(chooser), "media_files_opened",
- G_CALLBACK(parole_media_list_files_opened_cb), list);
+ G_CALLBACK(parole_media_list_files_opened_cb), list);
g_signal_connect(G_OBJECT(chooser), "iso_opened",
- G_CALLBACK(parole_media_list_iso_opened_cb), list);
+ G_CALLBACK(parole_media_list_iso_opened_cb), list);
}
static void
-parole_media_list_open_location_internal(ParoleMediaList *list)
-{
+parole_media_list_open_location_internal(ParoleMediaList *list) {
ParoleOpenLocation *location;
location = parole_open_location(gtk_widget_get_toplevel(GTK_WIDGET(list)));
g_signal_connect(G_OBJECT(location), "location-opened",
- G_CALLBACK(parole_media_list_location_opened_cb), list);
+ G_CALLBACK(parole_media_list_location_opened_cb), list);
}
/**
@@ -496,8 +465,7 @@ parole_media_list_open_location_internal(ParoleMediaList *list)
*
**/
static GSList *
-parole_media_list_get_files(ParoleMediaList *list)
-{
+parole_media_list_get_files(ParoleMediaList *list) {
ParoleFile *file;
GtkTreeIter iter;
gboolean valid;
@@ -505,8 +473,7 @@ parole_media_list_get_files(ParoleMediaList *list)
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter);
valid;
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(list->priv->store), &iter))
- {
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(list->priv->store), &iter)) {
gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter,
DATA_COL, &file,
-1);
@@ -525,8 +492,7 @@ void parole_media_list_drag_data_received_cb(GtkWidget *widget,
GtkSelectionData *data,
guint info,
guint drag_time,
- ParoleMediaList *list)
-{
+ ParoleMediaList *list) {
gchar **uri_list;
gchar *path;
guint i;
@@ -536,13 +502,12 @@ void parole_media_list_drag_data_received_cb(GtkWidget *widget,
parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(list)));
g_object_get(G_OBJECT(list->priv->conf),
- "play-opened-files", &play,
- NULL);
+ "play-opened-files", &play,
+ NULL);
uri_list = g_uri_list_extract_uris((const gchar *)gtk_selection_data_get_data(data));
- for ( i = 0; uri_list[i] != NULL; i++)
- {
+ for (i = 0; uri_list[i] != NULL; i++) {
path = g_filename_from_uri(uri_list[i], NULL, NULL);
added += parole_media_list_add_by_path(list, path, i == 0 ? play : FALSE);
@@ -555,11 +520,9 @@ void parole_media_list_drag_data_received_cb(GtkWidget *widget,
gtk_drag_finish(drag_context, added == i ? TRUE : FALSE, FALSE, drag_time);
}
-gboolean parole_media_list_key_press(GtkWidget *widget, GdkEventKey *ev, ParoleMediaList *list)
-{
+gboolean parole_media_list_key_press(GtkWidget *widget, GdkEventKey *ev, ParoleMediaList *list) {
GtkWidget *vbox_player;
- switch ( ev->keyval )
- {
+ switch ( ev->keyval ) {
case GDK_KEY_Delete:
parole_media_list_remove_clicked_cb(NULL, list);
return TRUE;
@@ -582,15 +545,13 @@ gboolean parole_media_list_key_press(GtkWidget *widget, GdkEventKey *ev, ParoleM
/* Callback for the add button */
void
-parole_media_list_add_clicked_cb(GtkButton *button, ParoleMediaList *list)
-{
+parole_media_list_add_clicked_cb(GtkButton *button, ParoleMediaList *list) {
parole_media_list_open_internal(list);
}
/* Callback for the clear button */
void
-parole_media_list_clear_clicked_cb(GtkButton *button, ParoleMediaList *list)
-{
+parole_media_list_clear_clicked_cb(GtkButton *button, ParoleMediaList *list) {
gchar *playlist_filename;
GFile *playlist_file;
parole_media_list_clear_list(list);
@@ -613,8 +574,7 @@ parole_media_list_clear_clicked_cb(GtkButton *button, ParoleMediaList *list)
*
**/
static GtkTreeRowReference *
-parole_media_list_get_first_selected_row(ParoleMediaList *list)
-{
+parole_media_list_get_first_selected_row(ParoleMediaList *list) {
GtkTreeModel *model;
GtkTreeRowReference *row = NULL;
GtkTreeIter iter;
@@ -622,13 +582,11 @@ parole_media_list_get_first_selected_row(ParoleMediaList *list)
path_list = gtk_tree_selection_get_selected_rows(list->priv->sel, &model);
- if ( g_list_length (path_list) > 0 )
- {
+ if (g_list_length(path_list) > 0) {
GtkTreePath *path;
path = g_list_nth_data(path_list, 0);
- if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ))
- {
+ if (G_LIKELY(gtk_tree_model_get_iter(model, &iter, path) == TRUE)) {
row = parole_media_list_get_row_reference_from_iter(list, &iter, FALSE);
}
}
@@ -648,18 +606,14 @@ parole_media_list_get_first_selected_row(ParoleMediaList *list)
* Returns: a #ParoleFile
**/
static ParoleFile *
-parole_media_list_get_first_selected_file(ParoleMediaList *list)
-{
+parole_media_list_get_first_selected_file(ParoleMediaList *list) {
ParoleFile *file = NULL;
GtkTreeRowReference *row;
GtkTreeIter iter;
row = parole_media_list_get_first_selected_row(list);
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store),
- &iter,
- gtk_tree_row_reference_get_path(row)) )
- {
+ if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, gtk_tree_row_reference_get_path(row)) ) {
gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter, DATA_COL, &file, -1);
}
@@ -667,15 +621,11 @@ parole_media_list_get_first_selected_file(ParoleMediaList *list)
}
static void
-parole_media_list_save_playlist_response_cb(GtkDialog *dialog,
- gint response_id,
- ParolePlaylistSave *data)
-{
+parole_media_list_save_playlist_response_cb(GtkDialog *dialog, gint response_id, ParolePlaylistSave *data) {
gchar *filename = NULL;
gchar *dirname = NULL;
- if (response_id == GTK_RESPONSE_ACCEPT)
- {
+ if (response_id == GTK_RESPONSE_ACCEPT) {
ParolePlFormat format = PAROLE_PL_FORMAT_UNKNOWN;
GSList *list = NULL;
GtkTreeModel *model;
@@ -684,13 +634,11 @@ parole_media_list_save_playlist_response_cb(GtkDialog *dialog,
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->chooser));
dirname = g_path_get_dirname(filename);
- if ( gtk_tree_selection_get_selected (data->sel, &model, &iter ) )
- {
+ if (gtk_tree_selection_get_selected(data->sel, &model, &iter)) {
gtk_tree_model_get(model, &iter, 2, &format, -1);
}
- if ( g_access (dirname, W_OK) == -1 )
- {
+ if (g_access(dirname, W_OK) == -1) {
gchar *msg;
msg = g_strdup_printf("%s %s", dirname, _("Permission denied"));
parole_dialog_error(GTK_WINDOW(gtk_widget_get_toplevel(data->list->priv->view)),
@@ -700,11 +648,9 @@ parole_media_list_save_playlist_response_cb(GtkDialog *dialog,
goto out;
}
- if ( format == PAROLE_PL_FORMAT_UNKNOWN )
- {
+ if ( format == PAROLE_PL_FORMAT_UNKNOWN ) {
format = parole_pl_parser_guess_format_from_extension(filename);
- if ( format == PAROLE_PL_FORMAT_UNKNOWN )
- {
+ if ( format == PAROLE_PL_FORMAT_UNKNOWN ) {
parole_dialog_info(GTK_WINDOW(gtk_widget_get_toplevel(data->list->priv->view)),
_("Unknown playlist format"),
_("Please choose a supported playlist format"));
@@ -727,39 +673,29 @@ out:
/* Query to get the data to populate the tooltip */
gboolean parole_media_list_query_tooltip(GtkWidget *widget,
- gint x,
- gint y,
- gboolean keyboard_mode,
- GtkTooltip *tooltip,
- ParoleMediaList *list)
-{
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip,
+ ParoleMediaList *list) {
GtkTreePath *path;
- if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view),
- x,
- y,
- &path,
- NULL,
- NULL,
- NULL))
- {
+ if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view), x, y, &path, NULL, NULL, NULL)) {
GtkTreeIter iter;
- if ( path && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
- {
+ if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
ParoleFile *file;
gchar *tip;
gchar *name;
gchar *len;
gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter,
- DATA_COL, &file,
- NAME_COL, &name,
- LENGTH_COL, &len,
- -1);
+ DATA_COL, &file,
+ NAME_COL, &name,
+ LENGTH_COL, &len,
+ -1);
- if (!len)
- {
+ if (!len) {
len = g_strdup(_("Unknown"));
}
@@ -782,8 +718,7 @@ gboolean parole_media_list_query_tooltip(GtkWidget *widget,
return FALSE;
}
-void parole_media_list_format_cursor_changed_cb(GtkTreeView *view, ParolePlaylistSave *data)
-{
+void parole_media_list_format_cursor_changed_cb(GtkTreeView *view, ParolePlaylistSave *data) {
GtkTreeIter iter;
GtkTreeModel *model;
ParolePlFormat format;
@@ -803,11 +738,9 @@ void parole_media_list_format_cursor_changed_cb(GtkTreeView *view, ParolePlaylis
g_free(filename);
- if ( gtk_tree_selection_get_selected (data->sel, &model, &iter ) )
- {
+ if (gtk_tree_selection_get_selected(data->sel, &model, &iter)) {
gtk_tree_model_get(model, &iter, 2, &format, -1);
- if ( format != PAROLE_PL_FORMAT_UNKNOWN )
- {
+ if ( format != PAROLE_PL_FORMAT_UNKNOWN ) {
gchar *name, *new_name;
name = parole_get_name_without_extension(fbasename);
new_name = g_strdup_printf("%s%s", name, playlist_format_map[format].ext);
@@ -820,8 +753,7 @@ void parole_media_list_format_cursor_changed_cb(GtkTreeView *view, ParolePlaylis
}
/* Callback to save the current playlist */
-void parole_media_list_save_cb(GtkWidget *widget, ParoleMediaList *list)
-{
+void parole_media_list_save_cb(GtkWidget *widget, ParoleMediaList *list) {
ParolePlaylistSave *data;
GtkWidget *chooser;
GtkWidget *view;
@@ -900,13 +832,11 @@ void parole_media_list_save_cb(GtkWidget *widget, ParoleMediaList *list)
* Returns: a #GtkTreePath
**/
static GtkTreePath *
-parole_media_list_get_first_path(GtkTreeModel *model)
-{
+parole_media_list_get_first_path(GtkTreeModel *model) {
GtkTreePath *path = NULL;
GtkTreeIter iter;
- if (gtk_tree_model_get_iter_first (model, &iter) )
- {
+ if (gtk_tree_model_get_iter_first(model, &iter)) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), &iter);
}
@@ -926,15 +856,13 @@ parole_media_list_get_first_path(GtkTreeModel *model)
*
**/
static GList *
-parole_media_list_paths_to_row_list(GList *path_list, GtkTreeModel *model)
-{
+parole_media_list_paths_to_row_list(GList *path_list, GtkTreeModel *model) {
GList *row_list = NULL;
guint len, i;
len = g_list_length(path_list);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
GtkTreePath *path;
GtkTreeRowReference *row;
@@ -950,8 +878,7 @@ parole_media_list_paths_to_row_list(GList *path_list, GtkTreeModel *model)
/* Callback for the remove-from-playlist button */
void
-parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
-{
+parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list) {
GtkTreeModel *model;
GList *path_list = NULL;
GList *row_list = NULL;
@@ -973,8 +900,7 @@ parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
* Select first path before the first path
* that we going to remove.
**/
- if (g_list_length (path_list) != 0)
- {
+ if (g_list_length(path_list) != 0) {
GtkTreePath *path, *prev;
/* Get first item */
@@ -983,8 +909,7 @@ parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
/* copy it as we don't mess with the list*/
prev = gtk_tree_path_copy(path);
- if ( gtk_tree_path_prev (prev) )
- {
+ if (gtk_tree_path_prev(prev)) {
parole_media_list_select_path(list, FALSE, prev);
row_selected = TRUE;
}
@@ -996,15 +921,13 @@ parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
len = g_list_length(row_list);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
GtkTreePath *path;
GtkTreeRowReference *row;
row = g_list_nth_data(row_list, i);
path = gtk_tree_row_reference_get_path(row);
- if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ) )
- {
+ if (G_LIKELY(gtk_tree_model_get_iter(model, &iter, path) == TRUE)) {
gtk_list_store_remove(GTK_LIST_STORE(model),
&iter);
}
@@ -1021,8 +944,7 @@ parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
nch = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
/* No row was selected, then select the first one*/
- if (!row_selected && nch != 0)
- {
+ if (!row_selected && nch != 0) {
GtkTreePath *path;
path = parole_media_list_get_first_path(model);
parole_media_list_select_path(list, FALSE, path);
@@ -1033,8 +955,7 @@ parole_media_list_remove_clicked_cb(GtkButton *button, ParoleMediaList *list)
}
void
-parole_media_list_move_up_clicked_cb(GtkButton *button, ParoleMediaList *list)
-{
+parole_media_list_move_up_clicked_cb(GtkButton *button, ParoleMediaList *list) {
GtkTreeModel *model;
GList *path_list = NULL;
GtkTreeIter current, iter;
@@ -1046,25 +967,20 @@ parole_media_list_move_up_clicked_cb(GtkButton *button, ParoleMediaList *list)
* Select first path before the first path
* that we going to move.
**/
- if (g_list_length (path_list) != 0)
- {
+ if (g_list_length(path_list) != 0) {
GtkTreePath *path, *prev;
guint i;
/* Get first item */
path = g_list_nth_data(path_list, 0);
- if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
- {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), ¤t, path)) {
/* copy it as we don't mess with the list*/
prev = gtk_tree_path_copy(path);
- if ( gtk_tree_path_prev (prev) )
- {
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, prev))
- {
+ if (gtk_tree_path_prev(prev)) {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, prev)) {
/* Move each item about the previous path */
- for (i=0; i < g_list_length(path_list); i++)
- {
+ for (i=0; i < g_list_length(path_list); i++) {
path = g_list_nth_data(path_list, i);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
gtk_list_store_move_before(GTK_LIST_STORE(model), ¤t, &iter);
@@ -1080,8 +996,7 @@ parole_media_list_move_up_clicked_cb(GtkButton *button, ParoleMediaList *list)
}
void
-parole_media_list_move_down_clicked_cb(GtkButton *button, ParoleMediaList *list)
-{
+parole_media_list_move_down_clicked_cb(GtkButton *button, ParoleMediaList *list) {
GtkTreeModel *model;
GList *path_list = NULL;
GtkTreeIter current, iter;
@@ -1095,25 +1010,21 @@ parole_media_list_move_down_clicked_cb(GtkButton *button, ParoleMediaList *list)
* Select first path before the first path
* that we going to move.
**/
- if (g_list_length (path_list) != 0)
- {
+ if (g_list_length(path_list) != 0) {
GtkTreePath *path, *next;
guint i;
/* Get first item */
path = g_list_nth_data(path_list, 0);
- if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
- {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), ¤t, path)) {
/* copy it as we don't mess with the list*/
next = gtk_tree_path_copy(path);
gtk_tree_path_next(next);
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, next))
- {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, next)) {
/* Move each item about the previous path */
- for (i=0; i < g_list_length(path_list); i++)
- {
+ for (i=0; i < g_list_length(path_list); i++) {
path = g_list_nth_data(path_list, i);
if (gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), ¤t, path))
gtk_list_store_move_after(GTK_LIST_STORE(model), ¤t, &iter);
@@ -1134,9 +1045,7 @@ parole_media_list_move_down_clicked_cb(GtkButton *button, ParoleMediaList *list)
*
**/
void
-parole_media_list_row_activated_cb(GtkTreeView *view, GtkTreePath *path,
- GtkTreeViewColumn *col, ParoleMediaList *list)
-{
+parole_media_list_row_activated_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *col, ParoleMediaList *list) {
GtkTreeRowReference *row;
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
@@ -1148,21 +1057,18 @@ parole_media_list_row_activated_cb(GtkTreeView *view, GtkTreePath *path,
}
static void
-parole_media_list_selection_changed_cb(GtkTreeSelection *sel, ParoleMediaList *list)
-{
+parole_media_list_selection_changed_cb(GtkTreeSelection *sel, ParoleMediaList *list) {
g_signal_emit(G_OBJECT(list), signals[MEDIA_CURSOR_CHANGED], 0,
- gtk_tree_selection_count_selected_rows(sel) > 0);
+ gtk_tree_selection_count_selected_rows(sel) > 0);
}
static void
-parole_media_list_open_folder(GtkWidget *menu)
-{
+parole_media_list_open_folder(GtkWidget *menu) {
gchar *dirname;
dirname =(gchar *) g_object_get_data(G_OBJECT(menu), "folder");
- if (dirname)
- {
+ if (dirname) {
gchar *uri;
uri = g_filename_to_uri(dirname, NULL, NULL);
TRACE("Opening %s", dirname);
@@ -1177,36 +1083,25 @@ parole_media_list_open_folder(GtkWidget *menu)
}
static void
-parole_media_list_add_open_containing_folder(ParoleMediaList *list, GtkWidget *menu,
- gint x, gint y)
-{
+parole_media_list_add_open_containing_folder(ParoleMediaList *list, GtkWidget *menu, gint x, gint y) {
GtkTreePath *path;
- if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view),
- x,
- y,
- &path,
- NULL,
- NULL,
- NULL))
- {
+ if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view), x, y, &path, NULL, NULL, NULL)) {
GtkTreeIter iter;
- if ( path && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
- {
+ if (path && gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
ParoleFile *file;
const gchar *filename;
const gchar *uri;
gtk_tree_model_get(GTK_TREE_MODEL(list->priv->store), &iter,
- DATA_COL, &file,
- -1);
+ DATA_COL, &file,
+ -1);
filename = parole_file_get_file_name(file);
uri = parole_file_get_uri(file);
- if (g_str_has_prefix (uri, "file:///"))
- {
+ if (g_str_has_prefix(uri, "file:///")) {
GtkWidget *mi;
gchar *dirname;
@@ -1235,21 +1130,18 @@ parole_media_list_add_open_containing_folder(ParoleMediaList *list, GtkWidget *m
}
void
-parole_media_list_set_playlist_view(ParoleMediaList *list, gint view)
-{
+parole_media_list_set_playlist_view(ParoleMediaList *list, gint view) {
gtk_notebook_set_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook), view);
gtk_widget_set_sensitive(list->priv->playlist_controls, !view);
}
void
-parole_media_list_clear_disc_list(ParoleMediaList *list)
-{
+parole_media_list_clear_disc_list(ParoleMediaList *list) {
gtk_list_store_clear(GTK_LIST_STORE(list->priv->disc_store));
}
void
-parole_media_list_clear_list(ParoleMediaList *list)
-{
+parole_media_list_clear_list(ParoleMediaList *list) {
TRACE("CLEAR START");
gtk_list_store_clear(GTK_LIST_STORE(list->priv->store));
parole_media_list_set_playlist_count(list, 0);
@@ -1257,29 +1149,26 @@ parole_media_list_clear_list(ParoleMediaList *list)
}
static void
-replace_list_activated_cb(GtkWidget *mi, ParoleConf *conf)
-{
+replace_list_activated_cb(GtkWidget *mi, ParoleConf *conf) {
g_object_set(G_OBJECT(conf),
- "replace-playlist", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
- NULL);
+ "replace-playlist", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
+ NULL);
}
static void
-play_opened_files_activated_cb(GtkWidget *mi, ParoleConf *conf)
-{
+play_opened_files_activated_cb(GtkWidget *mi, ParoleConf *conf) {
g_object_set(G_OBJECT(conf),
- "play-opened-files", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
- NULL);
+ "play-opened-files", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
+ NULL);
}
static void
-remember_playlist_activated_cb(GtkWidget *mi, ParoleConf *conf)
-{
+remember_playlist_activated_cb(GtkWidget *mi, ParoleConf *conf) {
gchar *playlist_filename;
GFile *playlist_file;
g_object_set(G_OBJECT(conf),
- "remember-playlist", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
- NULL);
+ "remember-playlist", gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi)),
+ NULL);
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(mi))) {
playlist_filename = xfce_resource_save_location(XFCE_RESOURCE_DATA,
PAROLE_AUTO_SAVED_PLAYLIST,
@@ -1291,14 +1180,12 @@ remember_playlist_activated_cb(GtkWidget *mi, ParoleConf *conf)
}
static void
-parole_media_list_destroy_menu(GtkWidget *menu)
-{
+parole_media_list_destroy_menu(GtkWidget *menu) {
gchar *dirname;
dirname =(gchar *) g_object_get_data(G_OBJECT(menu), "folder");
- if (dirname)
- {
+ if (dirname) {
g_free(dirname);
}
@@ -1306,8 +1193,7 @@ parole_media_list_destroy_menu(GtkWidget *menu)
}
static void
-parole_media_list_show_menu(ParoleMediaList *list, GdkEventButton *ev)
-{
+parole_media_list_show_menu(ParoleMediaList *list, GdkEventButton *ev) {
gboolean val;
#if GTK_CHECK_VERSION(3, 22, 0)
#else
@@ -1371,10 +1257,8 @@ parole_media_list_show_menu(ParoleMediaList *list, GdkEventButton *ev)
}
gboolean
-parole_media_list_button_release_event(GtkWidget *widget, GdkEventButton *ev, ParoleMediaList *list)
-{
- if ( ev->button == 3 )
- {
+parole_media_list_button_release_event(GtkWidget *widget, GdkEventButton *ev, ParoleMediaList *list) {
+ if ( ev->button == 3 ) {
parole_media_list_show_menu(list, ev);
return TRUE;
}
@@ -1383,8 +1267,7 @@ parole_media_list_button_release_event(GtkWidget *widget, GdkEventButton *ev, Pa
}
static void
-parole_media_list_select_path(ParoleMediaList *list, gboolean disc, GtkTreePath *path)
-{
+parole_media_list_select_path(ParoleMediaList *list, gboolean disc, GtkTreePath *path) {
if (disc) {
gtk_tree_selection_select_path(list->priv->disc_sel, path);
gtk_tree_view_set_cursor(GTK_TREE_VIEW(list->priv->disc_view), path, NULL, FALSE);
@@ -1395,8 +1278,7 @@ parole_media_list_select_path(ParoleMediaList *list, gboolean disc, GtkTreePath
}
static GtkTreeRowReference *
-parole_media_list_get_row_reference_from_iter(ParoleMediaList *list, GtkTreeIter *iter, gboolean select_path)
-{
+parole_media_list_get_row_reference_from_iter(ParoleMediaList *list, GtkTreeIter *iter, gboolean select_path) {
GtkTreePath *path;
GtkTreeRowReference *row;
@@ -1412,8 +1294,7 @@ parole_media_list_get_row_reference_from_iter(ParoleMediaList *list, GtkTreeIter
}
static void
-parole_media_list_finalize(GObject *object)
-{
+parole_media_list_finalize(GObject *object) {
ParoleMediaList *list;
list = PAROLE_MEDIA_LIST(object);
@@ -1424,8 +1305,7 @@ parole_media_list_finalize(GObject *object)
}
static void
-parole_media_list_class_init(ParoleMediaListClass *klass)
-{
+parole_media_list_class_init(ParoleMediaListClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_media_list_finalize;
@@ -1482,11 +1362,10 @@ parole_media_list_class_init(ParoleMediaListClass *klass)
static void
parole_media_list_playing_cell_data_func(GtkTreeViewColumn *column,
- GtkCellRenderer *renderer,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- GtkWidget *view)
-{
+ GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ GtkWidget *view) {
const char *name = NULL;
gint state = 0;
@@ -1511,8 +1390,7 @@ parole_media_list_playing_cell_data_func(GtkTreeViewColumn *column,
}
static void
-parole_media_list_setup_view(ParoleMediaList *list)
-{
+parole_media_list_setup_view(ParoleMediaList *list) {
GtkTreeSelection *sel, *disc_sel;
GtkListStore *list_store, *disc_list_store;
GtkCellRenderer *renderer, *disc_renderer;
@@ -1610,8 +1488,7 @@ parole_media_list_setup_view(ParoleMediaList *list)
}
static void
-parole_media_list_init(ParoleMediaList *list)
-{
+parole_media_list_init(ParoleMediaList *list) {
GtkBuilder *builder;
GtkWidget *box;
@@ -1651,8 +1528,7 @@ parole_media_list_init(ParoleMediaList *list)
}
GtkWidget *
-parole_media_list_get(void)
-{
+parole_media_list_get(void) {
static gpointer list = NULL;
if ( G_LIKELY(list != NULL ) ) {
@@ -1665,26 +1541,23 @@ parole_media_list_get(void)
return GTK_WIDGET (list);
}
-void parole_media_list_load(ParoleMediaList *list)
-{
+void parole_media_list_load(ParoleMediaList *list) {
gboolean load_saved_list;
gboolean play;
GSList *fileslist = NULL;
g_object_get(G_OBJECT(list->priv->conf),
- "play-opened-files", &play,
- "remember-playlist", &load_saved_list,
- NULL);
+ "play-opened-files", &play,
+ "remember-playlist", &load_saved_list,
+ NULL);
- if ( load_saved_list )
- {
+ if ( load_saved_list ) {
gchar *playlist_file;
playlist_file = xfce_resource_save_location(XFCE_RESOURCE_DATA,
PAROLE_AUTO_SAVED_PLAYLIST,
FALSE);
- if ( playlist_file )
- {
+ if ( playlist_file ) {
fileslist = parole_pl_parser_parse_from_file_by_extension(playlist_file);
g_free(playlist_file);
@@ -1695,8 +1568,7 @@ void parole_media_list_load(ParoleMediaList *list)
}
gboolean
-parole_media_list_add_by_path(ParoleMediaList *list, const gchar *path, gboolean emit)
-{
+parole_media_list_add_by_path(ParoleMediaList *list, const gchar *path, gboolean emit) {
GSList *files_list = NULL;
GtkFileFilter *filter;
guint len;
@@ -1731,10 +1603,7 @@ parole_media_list_add_by_path(ParoleMediaList *list, const gchar *path, gboolean
return ret;
}
-GtkTreeRowReference *parole_media_list_get_next_row(ParoleMediaList *list,
- GtkTreeRowReference *row,
- gboolean repeat)
-{
+GtkTreeRowReference *parole_media_list_get_next_row(ParoleMediaList *list, GtkTreeRowReference *row, gboolean repeat) {
GtkTreeRowReference *next = NULL;
GtkTreePath *path;
GtkTreeIter iter;
@@ -1762,9 +1631,7 @@ GtkTreeRowReference *parole_media_list_get_next_row(ParoleMediaList *list,
return next;
}
-GtkTreeRowReference *parole_media_list_get_prev_row(ParoleMediaList *list,
- GtkTreeRowReference *row)
-{
+GtkTreeRowReference *parole_media_list_get_prev_row(ParoleMediaList *list, GtkTreeRowReference *row) {
GtkTreeRowReference *prev = NULL;
GtkTreePath *path;
GtkTreeIter iter;
@@ -1790,9 +1657,7 @@ GtkTreeRowReference *parole_media_list_get_prev_row(ParoleMediaList *list,
return prev;
}
-GtkTreeRowReference *parole_media_list_get_row_n(ParoleMediaList *list,
- gint wanted_row)
-{
+GtkTreeRowReference *parole_media_list_get_row_n(ParoleMediaList *list, gint wanted_row) {
GtkTreeRowReference *row = NULL;
GtkTreePath *path;
GtkTreeIter iter;
@@ -1818,8 +1683,7 @@ GtkTreeRowReference *parole_media_list_get_row_n(ParoleMediaList *list,
return row;
}
-GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list)
-{
+GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list) {
GtkTreeRowReference *row = NULL;
GtkTreeIter iter;
GtkTreePath *path;
@@ -1830,13 +1694,11 @@ GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list)
nch = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(list->priv->store), NULL);
- if ( nch == 1 || nch == 0 )
- {
+ if ( nch == 1 || nch == 0 ) {
return NULL;
}
- if (nch == list->priv->n_shuffled_items && list->priv->n_shuffled_items != -1)
- {
+ if (nch == list->priv->n_shuffled_items && list->priv->n_shuffled_items != -1) {
/* Stop playing since (almost) every items in the list have been chosen */
list->priv->n_shuffled_items = 0;
return NULL;
@@ -1845,18 +1707,15 @@ GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list)
current_path = gtk_tree_path_to_string(gtk_tree_row_reference_get_path(parole_media_list_get_selected_row(list)));
path_str = g_strdup(current_path);
- if (!list->priv->history[0])
- {
+ if (!list->priv->history[0]) {
list->priv->history[0] = g_strdup(path_str);
}
- if (list->priv->n_shuffled_items == 0)
- {
+ if (list->priv->n_shuffled_items == 0) {
list->priv->n_shuffled_items = 1;
}
- while (g_strcmp0(list->priv->history[0], path_str) == 0 || g_strcmp0(list->priv->history[1], path_str) == 0 || g_strcmp0(list->priv->history[2], path_str) == 0 || g_strcmp0(current_path, path_str) == 0)
- {
+ while (g_strcmp0(list->priv->history[0], path_str) == 0 || g_strcmp0(list->priv->history[1], path_str) == 0 || g_strcmp0(list->priv->history[2], path_str) == 0 || g_strcmp0(current_path, path_str) == 0) {
path_str = g_strdup_printf("%i", g_random_int_range(0, nch));
count += 1;
if (count >= 10 && g_strcmp0(current_path, path_str) != 0)
@@ -1870,11 +1729,9 @@ GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list)
path = gtk_tree_path_new_from_string(path_str);
g_free(path_str);
- if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
- {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(list->priv->store), &iter, path)) {
row = gtk_tree_row_reference_new(GTK_TREE_MODEL(list->priv->store), path);
- if (list->priv->n_shuffled_items != -1)
- {
+ if (list->priv->n_shuffled_items != -1) {
list->priv->n_shuffled_items += 1;
}
}
@@ -1884,16 +1741,14 @@ GtkTreeRowReference *parole_media_list_get_row_random(ParoleMediaList *list)
return row;
}
-gboolean parole_media_list_is_selected_row(ParoleMediaList *list)
-{
+gboolean parole_media_list_is_selected_row(ParoleMediaList *list) {
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
return gtk_tree_selection_count_selected_rows (list->priv->sel) > 0;
else
return gtk_tree_selection_count_selected_rows (list->priv->disc_sel) > 0;
}
-gboolean parole_media_list_is_empty(ParoleMediaList *list)
-{
+gboolean parole_media_list_is_empty(ParoleMediaList *list) {
GtkTreeIter iter;
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
@@ -1909,8 +1764,7 @@ gboolean parole_media_list_is_empty(ParoleMediaList *list)
*
* Returns: a #GtkTreeRowReference of the first row in the media list.
**/
-GtkTreeRowReference *parole_media_list_get_first_row(ParoleMediaList *list)
-{
+GtkTreeRowReference *parole_media_list_get_first_row(ParoleMediaList *list) {
GtkTreeRowReference *row = NULL;
GtkTreeIter iter;
@@ -1932,8 +1786,7 @@ GtkTreeRowReference *parole_media_list_get_first_row(ParoleMediaList *list)
*
* Returns: a #GtkTreeRowReference of the selected row.
**/
-GtkTreeRowReference *parole_media_list_get_selected_row(ParoleMediaList *list)
-{
+GtkTreeRowReference *parole_media_list_get_selected_row(ParoleMediaList *list) {
return parole_media_list_get_first_selected_row (list);
}
@@ -1944,17 +1797,14 @@ GtkTreeRowReference *parole_media_list_get_selected_row(ParoleMediaList *list)
*
* Returns: a #ParoleFile of the selected row.
**/
-ParoleFile *parole_media_list_get_selected_file(ParoleMediaList *list)
-{
+ParoleFile *parole_media_list_get_selected_file(ParoleMediaList *list) {
return parole_media_list_get_first_selected_file (list);
}
-void parole_media_list_select_row(ParoleMediaList *list, GtkTreeRowReference *row)
-{
+void parole_media_list_select_row(ParoleMediaList *list, GtkTreeRowReference *row) {
GtkTreePath *path;
- if ( gtk_tree_row_reference_valid (row) )
- {
+ if (gtk_tree_row_reference_valid(row)) {
path = gtk_tree_row_reference_get_path(row);
parole_media_list_select_path(list,
gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 1,
@@ -1963,8 +1813,7 @@ void parole_media_list_select_row(ParoleMediaList *list, GtkTreeRowReference *ro
}
}
-void parole_media_list_set_row_playback_state(ParoleMediaList *list, GtkTreeRowReference *row, gint state)
-{
+void parole_media_list_set_row_playback_state(ParoleMediaList *list, GtkTreeRowReference *row, gint state) {
GtkTreeIter iter;
GtkTreePath *path;
@@ -1983,15 +1832,12 @@ void parole_media_list_set_row_playback_state(ParoleMediaList *list, GtkTreeRowR
}
}
-gchar* parole_media_list_get_row_name(ParoleMediaList *list,
-GtkTreeRowReference *row)
-{
+gchar* parole_media_list_get_row_name(ParoleMediaList *list, GtkTreeRowReference *row) {
GtkTreeIter iter;
GtkTreePath *path;
gchar *name = NULL;
- if ( gtk_tree_row_reference_valid (row) )
- {
+ if (gtk_tree_row_reference_valid(row)) {
path = gtk_tree_row_reference_get_path(row);
if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
@@ -2008,8 +1854,7 @@ GtkTreeRowReference *row)
return name;
}
-void parole_media_list_set_row_name(ParoleMediaList *list, GtkTreeRowReference *row, const gchar *name)
-{
+void parole_media_list_set_row_name(ParoleMediaList *list, GtkTreeRowReference *row, const gchar *name) {
GtkTreeIter iter;
GtkTreePath *path;
@@ -2028,8 +1873,7 @@ void parole_media_list_set_row_name(ParoleMediaList *list, GtkTreeRowReference *
}
}
-void parole_media_list_set_row_length(ParoleMediaList *list, GtkTreeRowReference *row, const gchar *len)
-{
+void parole_media_list_set_row_length(ParoleMediaList *list, GtkTreeRowReference *row, const gchar *len) {
GtkTreeIter iter;
GtkTreePath *path;
@@ -2048,23 +1892,19 @@ void parole_media_list_set_row_length(ParoleMediaList *list, GtkTreeRowReference
}
}
-void parole_media_list_open(ParoleMediaList *list)
-{
+void parole_media_list_open(ParoleMediaList *list) {
parole_media_list_open_internal(list);
}
-void parole_media_list_open_location(ParoleMediaList *list)
-{
+void parole_media_list_open_location(ParoleMediaList *list) {
parole_media_list_open_location_internal(list);
}
-gboolean parole_media_list_add_files(ParoleMediaList *list, gchar **filenames, gboolean enqueue)
-{
+gboolean parole_media_list_add_files(ParoleMediaList *list, gchar **filenames, gboolean enqueue) {
guint i;
guint added = 0;
- for ( i = 0; filenames && filenames[i] != NULL; i++)
- {
+ for (i = 0; filenames && filenames[i] != NULL; i++) {
/*
* File on disk?
*/
@@ -2088,16 +1928,14 @@ gboolean parole_media_list_add_files(ParoleMediaList *list, gchar **filenames, g
return added > 0;
}
-void parole_media_list_save_list(ParoleMediaList *list)
-{
+void parole_media_list_save_list(ParoleMediaList *list) {
gboolean save;
g_object_get(G_OBJECT(list->priv->conf),
- "remember-playlist", &save,
- NULL);
+ "remember-playlist", &save,
+ NULL);
- if ( save )
- {
+ if ( save ) {
GSList *fileslist;
gchar *history;
@@ -2132,24 +1970,21 @@ static gboolean parole_media_list_dbus_add_files(ParoleMediaList *list,
* DBus server implementation
*/
static void
-parole_media_list_dbus_class_init(ParoleMediaListClass *klass)
-{
+parole_media_list_dbus_class_init(ParoleMediaListClass *klass) {
dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
&dbus_glib_parole_media_list_object_info);
}
static void
-parole_media_list_dbus_init(ParoleMediaList *list)
-{
+parole_media_list_dbus_init(ParoleMediaList *list) {
dbus_g_connection_register_g_object(list->priv->bus,
PAROLE_DBUS_PLAYLIST_PATH,
G_OBJECT(list));
}
static gboolean parole_media_list_dbus_add_files(ParoleMediaList *list,
- gchar **in_files, gboolean enqueue,
- GError **error)
-{
+ gchar **in_files, gboolean enqueue,
+ GError **error) {
TRACE("Adding files for DBus request");
gtk_window_present(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(list))));
parole_media_list_add_files(list, in_files, enqueue);
@@ -2157,15 +1992,13 @@ static gboolean parole_media_list_dbus_add_files(ParoleMediaList *list,
return TRUE;
}
-void parole_media_list_grab_focus(ParoleMediaList *list)
-{
+void parole_media_list_grab_focus(ParoleMediaList *list) {
if (gtk_widget_get_visible (list->priv->view) )
gtk_widget_grab_focus(list->priv->view);
}
static void
-update_media_list_n_shuffled_items(void)
-{
+update_media_list_n_shuffled_items(void) {
gboolean repeat = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->repeat_button));
if (repeat) {
/* Disable the control on the number of shuffled items in case of randomization */
@@ -2177,12 +2010,10 @@ update_media_list_n_shuffled_items(void)
}
static void
-repeat_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer user_data)
-{
+repeat_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer user_data) {
gboolean active = g_simple_toggle_action_get_active(simple);
- if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->repeat_button)) != active)
- {
+ if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->repeat_button)) != active) {
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->repeat_button), active);
}
@@ -2190,14 +2021,12 @@ repeat_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer use
}
static void
-repeat_toggled(GtkWidget *widget, GSimpleAction *simple)
-{
+repeat_toggled(GtkWidget *widget, GSimpleAction *simple) {
gboolean active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->repeat_button));
g_simple_toggle_action_set_active(simple, active);
}
-void parole_media_list_connect_repeat_action(ParoleMediaList *list, GSimpleAction *simple)
-{
+void parole_media_list_connect_repeat_action(ParoleMediaList *list, GSimpleAction *simple) {
/* Connect state-changed event to modify widget */
g_signal_connect(G_OBJECT(simple), "notify::state", G_CALLBACK(repeat_action_state_changed), NULL);
/* Connect changed event to modify action */
@@ -2205,12 +2034,10 @@ void parole_media_list_connect_repeat_action(ParoleMediaList *list, GSimpleActio
}
static void
-shuffle_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer user_data)
-{
+shuffle_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer user_data) {
gboolean active = g_simple_toggle_action_get_active(simple);
- if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->shuffle_button)) != active)
- {
+ if (gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->shuffle_button)) != active) {
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->shuffle_button), active);
}
@@ -2218,14 +2045,12 @@ shuffle_action_state_changed(GSimpleAction *simple, GVariant *value, gpointer us
}
static void
-shuffle_toggled(GtkWidget *widget, GSimpleAction *simple)
-{
+shuffle_toggled(GtkWidget *widget, GSimpleAction *simple) {
gboolean active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(media_list->priv->shuffle_button));
g_simple_toggle_action_set_active(simple, active);
}
-void parole_media_list_connect_shuffle_action(ParoleMediaList *list, GSimpleAction *simple)
-{
+void parole_media_list_connect_shuffle_action(ParoleMediaList *list, GSimpleAction *simple) {
/* Connect state-changed event to modify widget */
g_signal_connect(G_OBJECT(simple), "notify::state", G_CALLBACK(shuffle_action_state_changed), NULL);
/* Connect changed event to modify action */
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index 5ec4633..a57c96e 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -32,8 +32,7 @@ G_BEGIN_DECLS
#define PAROLE_MEDIA_LIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_MEDIA_LIST, ParoleMediaList))
#define PAROLE_IS_MEDIA_LIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_MEDIA_LIST))
-enum
-{
+enum {
STATE_COL,
NAME_COL,
LENGTH_COL,
@@ -41,30 +40,25 @@ enum
COL_NUMBERS
};
-enum
-{
+enum {
PAROLE_MEDIA_STATE_NONE,
PAROLE_MEDIA_STATE_PAUSED,
PAROLE_MEDIA_STATE_PLAYING
};
-enum
-{
+enum {
PAROLE_MEDIA_LIST_PLAYLIST_VIEW_STANDARD,
PAROLE_MEDIA_LIST_PLAYLIST_VIEW_DISC
};
typedef struct ParoleMediaListPrivate ParoleMediaListPrivate;
-typedef struct
-{
+typedef struct {
GtkBox parent;
-
ParoleMediaListPrivate *priv;
} ParoleMediaList;
-typedef struct
-{
+typedef struct {
GtkBoxClass parent_class;
void (*media_activated) (ParoleMediaList *list,
diff --git a/src/parole-module.c b/src/parole-module.c
index 20feee6..0d652c2 100644
--- a/src/parole-module.c
+++ b/src/parole-module.c
@@ -39,14 +39,11 @@ static void parole_provider_module_class_init(ParoleProviderModuleClass *kl
static void parole_provider_module_init(ParoleProviderModule *module);
GType
-parole_provider_module_get_type(void)
-{
+parole_provider_module_get_type(void) {
static GType type = G_TYPE_INVALID;
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- static const GTypeInfo info =
- {
+ if (G_UNLIKELY(type == G_TYPE_INVALID)) {
+ static const GTypeInfo info = {
sizeof (ParoleProviderModuleClass),
NULL,
NULL,
@@ -59,8 +56,7 @@ parole_provider_module_get_type(void)
NULL,
};
- static const GInterfaceInfo plugin_info =
- {
+ static const GInterfaceInfo plugin_info = {
(GInterfaceInitFunc) parole_provider_module_plugin_init,
NULL,
NULL,
@@ -74,23 +70,20 @@ parole_provider_module_get_type(void)
}
static gboolean
-parole_module_load(GTypeModule *gtype_module)
-{
+parole_module_load(GTypeModule *gtype_module) {
ParoleProviderModule *module;
module = PAROLE_PROVIDER_MODULE(gtype_module);
module->library = g_module_open(gtype_module->name, G_MODULE_BIND_LOCAL);
- if ( G_UNLIKELY (module->library == NULL) )
- {
+ if (G_UNLIKELY(module->library == NULL)) {
g_critical("Failed to load plugin : %s", g_module_error());
return FALSE;
}
if ( !g_module_symbol(module->library, "parole_plugin_initialize", (gpointer)&module->initialize) ||
- !g_module_symbol(module->library, "parole_plugin_shutdown", (gpointer)&module->shutdown))
- {
+ !g_module_symbol(module->library, "parole_plugin_shutdown", (gpointer)&module->shutdown)) {
g_critical("Plugin %s missing required symbols", gtype_module->name);
g_module_close(module->library);
return FALSE;
@@ -107,8 +100,7 @@ parole_module_load(GTypeModule *gtype_module)
}
static void
-parole_module_unload(GTypeModule *gtype_module)
-{
+parole_module_unload(GTypeModule *gtype_module) {
ParoleProviderModule *module;
module = PAROLE_PROVIDER_MODULE(gtype_module);
@@ -126,8 +118,7 @@ parole_module_unload(GTypeModule *gtype_module)
}
static void
-parole_provider_module_class_init(ParoleProviderModuleClass *klass)
-{
+parole_provider_module_class_init(ParoleProviderModuleClass *klass) {
GTypeModuleClass *gtype_module_class;
gtype_module_class = G_TYPE_MODULE_CLASS(klass);
@@ -137,8 +128,7 @@ parole_provider_module_class_init(ParoleProviderModuleClass *klass)
}
static gboolean
-parole_provider_module_get_is_configurable(ParoleProviderPlugin *plugin)
-{
+parole_provider_module_get_is_configurable(ParoleProviderPlugin *plugin) {
ParoleProviderModule *module;
module = PAROLE_PROVIDER_MODULE(plugin);
@@ -150,8 +140,7 @@ parole_provider_module_get_is_configurable(ParoleProviderPlugin *plugin)
}
static void
-parole_provider_module_configure(ParoleProviderPlugin *plugin, GtkWidget *parent)
-{
+parole_provider_module_configure(ParoleProviderPlugin *plugin, GtkWidget *parent) {
ParoleProviderModule *module;
module = PAROLE_PROVIDER_MODULE(plugin);
@@ -161,15 +150,13 @@ parole_provider_module_configure(ParoleProviderPlugin *plugin, GtkWidget *parent
}
static void
-parole_provider_module_plugin_init(ParoleProviderPluginIface *iface)
-{
+parole_provider_module_plugin_init(ParoleProviderPluginIface *iface) {
iface->get_is_configurable = parole_provider_module_get_is_configurable;
iface->configure = parole_provider_module_configure;
}
static void
-parole_provider_module_init(ParoleProviderModule *module)
-{
+parole_provider_module_init(ParoleProviderModule *module) {
module->library = NULL;
module->library_name = NULL;
module->initialize = NULL;
@@ -183,8 +170,7 @@ parole_provider_module_init(ParoleProviderModule *module)
}
ParoleProviderModule *
-parole_provider_module_new(const gchar *filename, const gchar *desktop_file, const gchar *library_name)
-{
+parole_provider_module_new(const gchar *filename, const gchar *desktop_file, const gchar *library_name) {
ParoleProviderModule *module = NULL;
module = g_object_new(PAROLE_TYPE_PROVIDER_MODULE, NULL);
@@ -208,8 +194,7 @@ parole_provider_module_new(const gchar *filename, const gchar *desktop_file, con
*
* Initialize the #ParoleProviderModule plugin. Return #TRUE if successful.
**/
-gboolean parole_provider_module_new_plugin(ParoleProviderModule *module)
-{
+gboolean parole_provider_module_new_plugin(ParoleProviderModule *module) {
TRACE("start");
g_return_val_if_fail(PAROLE_IS_PROVIDER_MODULE(module), FALSE);
@@ -229,28 +214,24 @@ gboolean parole_provider_module_new_plugin(ParoleProviderModule *module)
return TRUE;
}
-void parole_provider_module_free_plugin(ParoleProviderModule *module)
-{
+void parole_provider_module_free_plugin(ParoleProviderModule *module) {
TRACE("start");
g_return_if_fail(PAROLE_IS_PROVIDER_MODULE(module));
- if ( module->instance )
- {
+ if ( module->instance ) {
g_object_unref(module->instance);
module->instance = NULL;
}
- if ( module->player )
- {
+ if ( module->player ) {
g_object_unref(module->player);
module->player = NULL;
}
}
gboolean
-parole_provider_module_get_is_active(ParoleProviderModule *module)
-{
+parole_provider_module_get_is_active(ParoleProviderModule *module) {
g_return_val_if_fail(PAROLE_IS_PROVIDER_MODULE(module), FALSE);
return module->active;
diff --git a/src/parole-module.h b/src/parole-module.h
index 7fc9b61..f252370 100644
--- a/src/parole-module.h
+++ b/src/parole-module.h
@@ -40,8 +40,7 @@ G_BEGIN_DECLS
typedef struct _ParoleProviderModuleClass ParoleProviderModuleClass;
typedef struct _ParoleProviderModule ParoleProviderModule;
-struct _ParoleProviderModule
-{
+struct _ParoleProviderModule {
GTypeModule parent;
GModule *library;
@@ -58,8 +57,7 @@ struct _ParoleProviderModule
gchar *desktop_file;
};
-struct _ParoleProviderModuleClass
-{
+struct _ParoleProviderModuleClass {
GTypeModuleClass parent_class;
};
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
index e5496a5..7983774 100644
--- a/src/parole-open-location.c
+++ b/src/parole-open-location.c
@@ -38,29 +38,25 @@
static void parole_open_location_finalize(GObject *object);
-struct ParoleOpenLocation
-{
+struct ParoleOpenLocation {
GObject parent;
GtkWidget *entry;
};
-struct ParoleOpenLocationClass
-{
+struct ParoleOpenLocationClass {
GObjectClass parent_class;
void(*location_opened)(ParoleOpenLocation *self,
const gchar *address);
};
-enum
-{
+enum {
LOCATION_OPENED,
LAST_SIGNAL
};
-enum
-{
+enum {
COL_ADDRESS,
N_COLS
};
@@ -71,15 +67,13 @@ G_DEFINE_TYPE(ParoleOpenLocation, parole_open_location, G_TYPE_OBJECT)
/* Callback for the open button which passes on the location and closes the dialog */
static void
-parole_open_location_response_cb(GtkDialog *dialog, gint response_id, ParoleOpenLocation *self)
-{
+parole_open_location_response_cb(GtkDialog *dialog, gint response_id, ParoleOpenLocation *self) {
const gchar *location;
if ( response_id == 0 )
return;
- if ( response_id == GTK_RESPONSE_OK )
- {
+ if ( response_id == GTK_RESPONSE_OK ) {
location = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(self->entry));
if ( !location || strlen (location) == 0)
@@ -97,8 +91,7 @@ out:
/* Populate the history-popup */
static GtkTreeModel *
-parole_open_location_get_completion_model(void)
-{
+parole_open_location_get_completion_model(void) {
GtkListStore *store;
GtkTreeIter iter;
gchar **lines = NULL;
@@ -108,12 +101,9 @@ parole_open_location_get_completion_model(void)
lines = parole_get_history();
- if ( lines )
- {
- for ( i = 0; lines[i]; i++)
- {
- if ( g_strcmp0(lines[i], "") != 0 )
- {
+ if ( lines ) {
+ for (i = 0; lines[i]; i++) {
+ if ( g_strcmp0(lines[i], "") != 0 ) {
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
COL_ADDRESS, lines[i],
@@ -127,44 +117,39 @@ parole_open_location_get_completion_model(void)
}
static void
-parole_open_location_class_init(ParoleOpenLocationClass *klass)
-{
+parole_open_location_class_init(ParoleOpenLocationClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_open_location_finalize;
signals[LOCATION_OPENED] =
g_signal_new("location-opened",
- PAROLE_TYPE_OPEN_LOCATION,
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(ParoleOpenLocationClass, location_opened),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
+ PAROLE_TYPE_OPEN_LOCATION,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(ParoleOpenLocationClass, location_opened),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
}
static void
-parole_open_location_init(ParoleOpenLocation *self)
-{
+parole_open_location_init(ParoleOpenLocation *self) {
}
static void
-parole_open_location_finalize(GObject *object)
-{
+parole_open_location_finalize(GObject *object) {
G_OBJECT_CLASS(parole_open_location_parent_class)->finalize(object);
}
/* Clear the location history */
static void
-parole_open_location_clear_history(GtkTreeModel *model)
-{
+parole_open_location_clear_history(GtkTreeModel *model) {
parole_clear_history_file();
gtk_list_store_clear(GTK_LIST_STORE(model));
}
/* Main function to open the "open location" dialog */
-ParoleOpenLocation *parole_open_location(GtkWidget *parent)
-{
+ParoleOpenLocation *parole_open_location(GtkWidget *parent) {
ParoleOpenLocation *self;
GtkWidget *dialog;
GtkTreeModel *model;
diff --git a/src/parole-player.c b/src/parole-player.c
index d661d87..66e01d4 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -87,8 +87,7 @@ gboolean block_playlist_updates = FALSE;
ParolePlayer *parole_player = NULL;
static void
-get_time_string(gchar *timestring, gint total_seconds)
-{
+get_time_string(gchar *timestring, gint total_seconds) {
gint hours;
gint minutes;
gint seconds;
@@ -323,8 +322,7 @@ static void parole_player_set_cursor_visible(ParolePlayer *player,
gboolean parole_player_hide_controls(gpointer data);
-static GtkTargetEntry target_entry[] =
-{
+static GtkTargetEntry target_entry[] = {
{ "STRING", 0, 0 },
{ "text/uri-list", 0, 1 },
};
@@ -335,8 +333,7 @@ static GtkTargetEntry target_entry[] =
#define PAROLE_PLAYER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_PLAYER, ParolePlayerPrivate))
-struct ParolePlayerPrivate
-{
+struct ParolePlayerPrivate {
DBusGConnection *bus;
ParoleMediaList *list;
ParoleDisc *disc;
@@ -460,81 +457,68 @@ struct ParolePlayerPrivate
gboolean exit;
};
-enum
-{
+enum {
PROP_0,
PROP_CLIENT_ID
};
G_DEFINE_TYPE(ParolePlayer, parole_player, G_TYPE_OBJECT)
-void parole_show_about(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_show_about(GtkWidget *widget, ParolePlayer *player) {
parole_about(GTK_WINDOW(player->priv->window));
}
-void parole_show_shortcuts(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_show_shortcuts(GtkWidget *widget, ParolePlayer *player) {
parole_shortcuts(GTK_WIDGET(player->priv->window));
}
-void ratio_none_toggled_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void ratio_none_toggled_cb(GtkWidget *widget, ParolePlayer *player) {
g_object_set(G_OBJECT(player->priv->conf),
- "aspect-ratio", PAROLE_ASPECT_RATIO_NONE,
- NULL);
+ "aspect-ratio", PAROLE_ASPECT_RATIO_NONE,
+ NULL);
}
-void ratio_auto_toggled_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void ratio_auto_toggled_cb(GtkWidget *widget, ParolePlayer *player) {
g_object_set(G_OBJECT(player->priv->conf),
- "aspect-ratio", PAROLE_ASPECT_RATIO_AUTO,
- NULL);
+ "aspect-ratio", PAROLE_ASPECT_RATIO_AUTO,
+ NULL);
}
-void ratio_square_toggled_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void ratio_square_toggled_cb(GtkWidget *widget, ParolePlayer *player) {
g_object_set(G_OBJECT(player->priv->conf),
"aspect-ratio", PAROLE_ASPECT_RATIO_SQUARE,
NULL);
}
-void ratio_4_3_toggled_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void ratio_4_3_toggled_cb(GtkWidget *widget, ParolePlayer *player) {
g_object_set(G_OBJECT(player->priv->conf),
- "aspect-ratio", PAROLE_ASPECT_RATIO_4_3,
- NULL);
+ "aspect-ratio", PAROLE_ASPECT_RATIO_4_3,
+ NULL);
}
-void ratio_16_9_toggled_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void ratio_16_9_toggled_cb(GtkWidget *widget, ParolePlayer *player) {
g_object_set(G_OBJECT(player->priv->conf),
- "aspect-ratio", PAROLE_ASPECT_RATIO_16_9,
- NULL);
+ "aspect-ratio", PAROLE_ASPECT_RATIO_16_9,
+ NULL);
}
-void ratio_20_9_toggled_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void ratio_20_9_toggled_cb(GtkWidget *widget, ParolePlayer *player) {
g_object_set(G_OBJECT(player->priv->conf),
- "aspect-ratio", PAROLE_ASPECT_RATIO_DVB,
- NULL);
+ "aspect-ratio", PAROLE_ASPECT_RATIO_DVB,
+ NULL);
}
-void parole_player_widget_activate_action(GtkWidget *widget,
- GSimpleAction *action)
-{
+void parole_player_widget_activate_action(GtkWidget *widget, GSimpleAction *action) {
g_action_activate(G_ACTION(action), NULL);
}
-static void toggle_action_cb(GtkWidget *widget, GSimpleAction *action)
-{
+static void toggle_action_cb(GtkWidget *widget, GSimpleAction *action) {
if (!block_playlist_updates)
g_simple_toggle_action_set_active(action,
!g_simple_toggle_action_get_active(action));
}
-void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibility)
-{
+void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibility) {
gint window_w, window_h, playlist_w;
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
@@ -573,8 +557,7 @@ void parole_player_set_playlist_visible(ParolePlayer *player, gboolean visibilit
}
}
-void parole_player_toggle_playlist_action_cb(GSimpleAction *action)
-{
+void parole_player_toggle_playlist_action_cb(GSimpleAction *action) {
gboolean visible;
visible = gtk_widget_get_visible(parole_player->priv->playlist_nt);
@@ -583,12 +566,10 @@ void parole_player_toggle_playlist_action_cb(GSimpleAction *action)
}
static void
-parole_player_change_range_value(ParolePlayer *player, gdouble value)
-{
+parole_player_change_range_value(ParolePlayer *player, gdouble value) {
gchar pos_text[128];
- if ( !player->priv->user_seeking )
- {
+ if ( !player->priv->user_seeking ) {
player->priv->internal_range_change = TRUE;
gtk_range_set_value(GTK_RANGE(player->priv->range), value);
@@ -601,8 +582,7 @@ parole_player_change_range_value(ParolePlayer *player, gdouble value)
}
static void
-parole_player_reset(ParolePlayer *player)
-{
+parole_player_reset(ParolePlayer *player) {
parole_gst_stop(PAROLE_GST(player->priv->gst));
player->priv->update_languages = TRUE;
gtk_window_set_title(GTK_WINDOW(player->priv->window), _("Parole Media Player"));
@@ -613,15 +593,13 @@ parole_player_reset(ParolePlayer *player)
gtk_widget_hide(GTK_WIDGET(player->priv->infobar));
parole_player_change_range_value(player, 0);
- if ( player->priv->row )
- {
+ if ( player->priv->row ) {
parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
}
- if (player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD)
- {
+ if (player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD) {
TRACE("CLEAR DVD LIST");
parole_media_list_clear_disc_list(player->priv->list);
TRACE("END CLEAR DVD LIST");
@@ -635,10 +613,8 @@ parole_player_reset(ParolePlayer *player)
}
static void
-parole_player_dvd_reset(ParolePlayer *player)
-{
- if ( player->priv->row )
- {
+parole_player_dvd_reset(ParolePlayer *player) {
+ if ( player->priv->row ) {
parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
@@ -646,38 +622,32 @@ parole_player_dvd_reset(ParolePlayer *player)
}
void
-parole_player_dvd_menu_activated(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_dvd_menu_activated(GtkMenuItem *widget, ParolePlayer *player) {
parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_ROOT_MENU);
}
void
-parole_player_dvd_title_activated(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_dvd_title_activated(GtkMenuItem *widget, ParolePlayer *player) {
parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_TITLE_MENU);
}
void
-parole_player_dvd_audio_activated(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_dvd_audio_activated(GtkMenuItem *widget, ParolePlayer *player) {
parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_AUDIO_MENU);
}
void
-parole_player_dvd_angle_activated(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_dvd_angle_activated(GtkMenuItem *widget, ParolePlayer *player) {
parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_ANGLE_MENU);
}
void
-parole_player_dvd_chapter_activated(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_dvd_chapter_activated(GtkMenuItem *widget, ParolePlayer *player) {
parole_gst_send_navigation_command(PAROLE_GST(player->priv->gst), GST_DVD_CHAPTER_MENU);
}
static gboolean
-parole_sublang_equal_lists (GList *orig, GList *new)
-{
+parole_sublang_equal_lists (GList *orig, GList *new) {
GList *o, *n;
gboolean retval;
@@ -692,8 +662,7 @@ parole_sublang_equal_lists (GList *orig, GList *new)
retval = TRUE;
o = orig;
n = new;
- while (o != NULL && n != NULL && retval != FALSE)
- {
+ while (o != NULL && n != NULL && retval != FALSE) {
if (g_str_equal(o->data, n->data) == FALSE) {
retval = FALSE;
}
@@ -705,16 +674,14 @@ parole_sublang_equal_lists (GList *orig, GList *new)
}
static void
-parole_player_clear_chapters(ParolePlayer *player)
-{
+parole_player_clear_chapters(ParolePlayer *player) {
GList *menu_items, *menu_iter;
gint counter = 0;
/* Clear the chapter menu options */
menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->chapters_menu));
- for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
- {
+ for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) {
if (counter >= 2)
gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
counter++;
@@ -723,21 +690,18 @@ parole_player_clear_chapters(ParolePlayer *player)
}
static void
-parole_player_chapter_selection_changed_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_chapter_selection_changed_cb(GtkWidget *widget, ParolePlayer *player) {
gint chapter_id = atoi((char*)g_object_get_data(G_OBJECT(widget), "chapter-id"));
parole_gst_set_dvd_chapter(PAROLE_GST(player->priv->gst) , chapter_id);
}
static void
-parole_player_update_chapters(ParolePlayer *player, gint chapter_count)
-{
+parole_player_update_chapters(ParolePlayer *player, gint chapter_count) {
int chapter_id;
GtkWidget *menu_item;
parole_player_clear_chapters(player);
- for (chapter_id=0; chapter_id < chapter_count; chapter_id++)
- {
+ for (chapter_id=0; chapter_id < chapter_count; chapter_id++) {
menu_item = GTK_WIDGET(gtk_menu_item_new_with_label(g_strdup_printf(_("Chapter %i"), chapter_id+1)));
gtk_widget_show(menu_item);
@@ -750,8 +714,7 @@ parole_player_update_chapters(ParolePlayer *player, gint chapter_count)
}
static void
-parole_player_clear_subtitles(ParolePlayer *player)
-{
+parole_player_clear_subtitles(ParolePlayer *player) {
GtkTreeIter iter;
GList *menu_items, *menu_iter;
gint counter = 0;
@@ -766,8 +729,7 @@ parole_player_clear_subtitles(ParolePlayer *player)
menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->subtitles_menu));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->subtitles_group), TRUE);
- for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
- {
+ for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) {
if (counter >= 4)
gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
counter++;
@@ -776,8 +738,7 @@ parole_player_clear_subtitles(ParolePlayer *player)
}
static void
-parole_player_set_subtitles_list(ParolePlayer *player, GList *subtitle_list)
-{
+parole_player_set_subtitles_list(ParolePlayer *player, GList *subtitle_list) {
GList *l;
gchar* language;
@@ -790,8 +751,7 @@ parole_player_set_subtitles_list(ParolePlayer *player, GList *subtitle_list)
player->priv->subtitle_list = subtitle_list;
- for (l = subtitle_list; l != NULL; l = l->next)
- {
+ for (l = subtitle_list; l != NULL; l = l->next) {
language = g_strdup(l->data);
gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
@@ -815,8 +775,7 @@ parole_player_set_subtitles_list(ParolePlayer *player, GList *subtitle_list)
}
static void
-parole_player_clear_audio_tracks(ParolePlayer *player)
-{
+parole_player_clear_audio_tracks(ParolePlayer *player) {
GList *menu_items, *menu_iter;
GtkWidget *empty_item;
@@ -839,8 +798,7 @@ parole_player_clear_audio_tracks(ParolePlayer *player)
}
static void
-parole_player_set_audio_list(ParolePlayer *player, GList *audio_list)
-{
+parole_player_set_audio_list(ParolePlayer *player, GList *audio_list) {
GList *menu_iter;
GList *l;
gchar* language;
@@ -858,8 +816,7 @@ parole_player_set_audio_list(ParolePlayer *player, GList *audio_list)
player->priv->audio_list = audio_list;
- for (l = audio_list; l != NULL; l = l->next)
- {
+ for (l = audio_list; l != NULL; l = l->next) {
language = g_strdup(l->data);
gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter);
@@ -896,12 +853,10 @@ parole_player_set_audio_list(ParolePlayer *player, GList *audio_list)
}
static void
-parole_player_update_audio_tracks(ParolePlayer *player, ParoleGst *gst)
-{
+parole_player_update_audio_tracks(ParolePlayer *player, ParoleGst *gst) {
GList * list = gst_get_lang_list_for_type(gst, "AUDIO");
- if (parole_sublang_equal_lists (player->priv->audio_list, list) == TRUE)
- {
+ if (parole_sublang_equal_lists(player->priv->audio_list, list) == TRUE) {
return;
}
@@ -913,8 +868,7 @@ parole_player_update_audio_tracks(ParolePlayer *player, ParoleGst *gst)
}
static void
-parole_player_update_subtitles(ParolePlayer *player, ParoleGst *gst)
-{
+parole_player_update_subtitles(ParolePlayer *player, ParoleGst *gst) {
GList * list = gst_get_lang_list_for_type(gst, "TEXT");
guint64 sub_index;
@@ -929,10 +883,8 @@ parole_player_update_subtitles(ParolePlayer *player, ParoleGst *gst)
if (sub_enabled)
sub_index = 1;
- if (parole_sublang_equal_lists (player->priv->subtitle_list, list) == TRUE)
- {
- if (g_list_length (list) == 0)
- {
+ if (parole_sublang_equal_lists(player->priv->subtitle_list, list) == TRUE) {
+ if (g_list_length(list) == 0) {
parole_player_clear_subtitles(player);
}
return;
@@ -951,8 +903,7 @@ parole_player_update_subtitles(ParolePlayer *player, ParoleGst *gst)
}
static void
-parole_player_update_languages(ParolePlayer *player, ParoleGst *gst)
-{
+parole_player_update_languages(ParolePlayer *player, ParoleGst *gst) {
if (player->priv->update_languages == TRUE) {
if (gst_get_has_video(PAROLE_GST(player->priv->gst))) {
parole_player_update_audio_tracks(player, gst);
@@ -970,14 +921,12 @@ parole_player_update_languages(ParolePlayer *player, ParoleGst *gst)
}
static void
-parole_player_show_audiobox(ParolePlayer *player)
-{
+parole_player_show_audiobox(ParolePlayer *player) {
/* Only show the audiobox if we're sure there's no video playing and
visualizations are disabled. */
gtk_widget_hide(player->priv->logo_image);
if (!gst_get_has_video(PAROLE_GST(player->priv->gst)) &&
- !gst_get_has_vis(PAROLE_GST(player->priv->gst)))
- {
+ !gst_get_has_vis(PAROLE_GST(player->priv->gst))) {
gtk_widget_show(player->priv->audiobox);
gtk_widget_hide(player->priv->videobox);
} else {
@@ -995,8 +944,7 @@ parole_player_show_audiobox(ParolePlayer *player)
* the subtitles selected.
**/
static void
-parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data)
-{
+parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data) {
ParolePlayer *player;
ParoleFile *file;
@@ -1060,16 +1008,14 @@ parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data)
gtk_widget_destroy(chooser);
- if ( sub )
- {
+ if ( sub ) {
/* Get the current playing file uri. */
uri = parole_gst_get_file_uri(PAROLE_GST(player->priv->gst));
/* Reset the player. */
parole_player_reset(player);
- if ( g_str_has_prefix (uri, "file:/") )
- {
+ if (g_str_has_prefix(uri, "file:/")) {
TRACE("Trying to play media file %s", uri);
TRACE("Trying to use subtitle file %s", sub);
player->priv->updated_subs = TRUE;
@@ -1078,8 +1024,7 @@ parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data)
/* Set the subtitles in gst as well as in the media list, for later
retrieval. */
- if ( file )
- {
+ if ( file ) {
parole_file_set_custom_subtitles(file, sub);
parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
parole_gst_play_uri(PAROLE_GST(player->priv->gst), uri, sub);
@@ -1092,75 +1037,67 @@ parole_player_select_custom_subtitle(GtkMenuItem *widget, gpointer data)
}
static void
-parole_player_media_activated_cb(ParoleMediaList *list, GtkTreeRowReference *row, ParolePlayer *player)
-{
+parole_player_media_activated_cb(ParoleMediaList *list, GtkTreeRowReference *row, ParolePlayer *player) {
ParoleFile *file;
GtkTreeIter iter;
GtkTreeModel *model;
model = gtk_tree_row_reference_get_model(row);
- if ( gtk_tree_model_get_iter (model, &iter, gtk_tree_row_reference_get_path (row)) )
- {
+ if (gtk_tree_model_get_iter(model, &iter, gtk_tree_row_reference_get_path(row))) {
gtk_tree_model_get(model, &iter, DATA_COL, &file, -1);
- if ( file )
- {
- const gchar *sub = NULL;
- const gchar *uri;
- const gchar *directory = NULL;
- gint dvd_chapter;
-
- uri = parole_file_get_uri(file);
- directory = parole_file_get_directory(file);
-
- if ( g_str_has_prefix (uri, "dvd") )
- {
- parole_player_dvd_reset(player);
+ if ( file ) {
+ const gchar *sub = NULL;
+ const gchar *uri;
+ const gchar *directory = NULL;
+ gint dvd_chapter;
+
+ uri = parole_file_get_uri(file);
+ directory = parole_file_get_directory(file);
+
+ if (g_str_has_prefix(uri, "dvd")) {
+ parole_player_dvd_reset(player);
+ player->priv->row = gtk_tree_row_reference_copy(row);
+ dvd_chapter = parole_file_get_dvd_chapter(file);
+ parole_gst_set_dvd_chapter(PAROLE_GST(player->priv->gst), dvd_chapter);
+ g_object_unref(file);
+ return;
+ }
+ parole_player_reset(player);
player->priv->row = gtk_tree_row_reference_copy(row);
- dvd_chapter = parole_file_get_dvd_chapter(file);
- parole_gst_set_dvd_chapter(PAROLE_GST(player->priv->gst), dvd_chapter);
- g_object_unref(file);
- return;
- }
- parole_player_reset(player);
- player->priv->row = gtk_tree_row_reference_copy(row);
-
- if ( g_str_has_prefix (uri, "file:/") )
- {
- if ( parole_file_filter (player->priv->video_filter, file) )
- {
- sub = parole_file_get_custom_subtitles(file);
- parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
- if (sub == NULL)
- sub = parole_get_subtitle_path(uri);
+
+ if (g_str_has_prefix(uri, "file:/")) {
+ if (parole_file_filter(player->priv->video_filter, file)) {
+ sub = parole_file_get_custom_subtitles(file);
+ parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
+ if (sub == NULL)
+ sub = parole_get_subtitle_path(uri);
+ }
}
- }
- TRACE("Trying to play media file %s", uri);
- TRACE("File content type %s", parole_file_get_content_type(file));
+ TRACE("Trying to play media file %s", uri);
+ TRACE("File content type %s", parole_file_get_content_type(file));
- parole_gst_play_uri(PAROLE_GST(player->priv->gst),
- parole_file_get_uri(file),
- sub);
+ parole_gst_play_uri(PAROLE_GST(player->priv->gst),
+ parole_file_get_uri(file),
+ sub);
- gtk_window_set_title(GTK_WINDOW(player->priv->window), parole_media_list_get_row_name(player->priv->list, player->priv->row));
+ gtk_window_set_title(GTK_WINDOW(player->priv->window), parole_media_list_get_row_name(player->priv->list, player->priv->row));
- if ( directory )
- {
- g_object_set(G_OBJECT(player->priv->conf),
- "media-chooser-folder", directory,
- NULL);
- }
+ if ( directory ) {
+ g_object_set(G_OBJECT(player->priv->conf),
+ "media-chooser-folder", directory,
+ NULL);
+ }
- g_object_unref(file);
- }
+ g_object_unref(file);
+ }
}
}
static void
-parole_player_disc_selected_cb(ParoleDisc *disc, const gchar *uri, const gchar *device, ParolePlayer *player)
-{
+parole_player_disc_selected_cb(ParoleDisc *disc, const gchar *uri, const gchar *device, ParolePlayer *player) {
parole_player_reset(player);
parole_gst_play_device_uri(PAROLE_GST(player->priv->gst), uri, device);
player->priv->current_media_type = parole_gst_get_current_stream_type(PAROLE_GST(player->priv->gst));
@@ -1184,22 +1121,19 @@ parole_player_disc_selected_cb(ParoleDisc *disc, const gchar *uri, const gchar *
}
static void
-parole_player_uri_opened_cb(ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
-{
+parole_player_uri_opened_cb(ParoleMediaList *list, const gchar *uri, ParolePlayer *player) {
parole_player_reset(player);
parole_gst_play_uri(PAROLE_GST(player->priv->gst), uri, NULL);
}
static void
-parole_player_iso_opened_cb(ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
-{
+parole_player_iso_opened_cb(ParoleMediaList *list, const gchar *uri, ParolePlayer *player) {
parole_player_reset(player);
parole_player_disc_selected_cb(NULL, uri, NULL, player);
}
static void
-parole_player_recent_menu_clear_activated_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_recent_menu_clear_activated_cb(GtkWidget *widget, ParolePlayer *player) {
GtkWidget *dlg;
GtkWidget *clear_button;
gint response;
@@ -1225,8 +1159,7 @@ parole_player_recent_menu_clear_activated_cb(GtkWidget *widget, ParolePlayer *pl
gtk_widget_show_all(dlg);
response = gtk_dialog_run(GTK_DIALOG(dlg));
- if (response == 1)
- {
+ if (response == 1) {
GList *items, *l;
items = gtk_recent_manager_get_items(player->priv->recent);
@@ -1245,8 +1178,7 @@ parole_player_recent_menu_clear_activated_cb(GtkWidget *widget, ParolePlayer *pl
}
static void
-parole_player_recent_menu_item_activated_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_recent_menu_item_activated_cb(GtkWidget *widget, ParolePlayer *player) {
gchar *uri;
gchar *filename;
gchar *filenames[] = {NULL, NULL};
@@ -1256,8 +1188,7 @@ parole_player_recent_menu_item_activated_cb(GtkWidget *widget, ParolePlayer *pla
filename = g_filename_from_uri(uri, NULL, NULL);
- if (g_file_test (filename, G_FILE_TEST_EXISTS))
- {
+ if (g_file_test(filename, G_FILE_TEST_EXISTS)) {
gtk_recent_manager_add_item(player->priv->recent, uri);
filenames[0] = g_strdup(filename);
@@ -1273,15 +1204,13 @@ parole_player_recent_menu_item_activated_cb(GtkWidget *widget, ParolePlayer *pla
}
static void
-parole_player_media_cursor_changed_cb(ParoleMediaList *list, gboolean media_selected, ParolePlayer *player)
-{
+parole_player_media_cursor_changed_cb(ParoleMediaList *list, gboolean media_selected, ParolePlayer *player) {
gboolean enabled;
/* Play/Pause */
- if (player->priv->state < PAROLE_STATE_PAUSED)
- {
- g_simple_action_set_enabled(player->priv->media_playpause_action,
- media_selected || !parole_media_list_is_empty(player->priv->list));
+ if (player->priv->state < PAROLE_STATE_PAUSED) {
+ g_simple_action_set_enabled(player->priv->media_playpause_action,
+ media_selected || !parole_media_list_is_empty(player->priv->list));
}
enabled = parole_media_list_get_playlist_count(player->priv->list) > 1;
@@ -1296,42 +1225,37 @@ parole_player_media_cursor_changed_cb(ParoleMediaList *list, gboolean media_sele
}
static void
-parole_player_media_list_show_playlist_cb(ParoleMediaList *list, gboolean show_playlist, ParolePlayer *player)
-{
+parole_player_media_list_show_playlist_cb(ParoleMediaList *list, gboolean show_playlist, ParolePlayer *player) {
parole_media_list_set_playlist_view(player->priv->list,
player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD);
parole_player_set_playlist_visible(player, show_playlist);
}
static void
-parole_player_media_progressed_cb(ParoleGst *gst, const ParoleStream *stream, gint64 value, ParolePlayer *player)
-{
+parole_player_media_progressed_cb(ParoleGst *gst, const ParoleStream *stream, gint64 value, ParolePlayer *player) {
#ifdef DEBUG
g_return_if_fail(value > 0);
#endif
- if (!player->priv->user_seeking)
- {
+ if (!player->priv->user_seeking) {
parole_player_change_range_value(player, value);
}
}
static void
-parole_player_seekable_notify(ParoleStream *stream, GParamSpec *spec, ParolePlayer *player)
-{
+parole_player_seekable_notify(ParoleStream *stream, GParamSpec *spec, ParolePlayer *player) {
gboolean seekable;
g_object_get(G_OBJECT(stream),
- "seekable", &seekable,
- NULL);
+ "seekable", &seekable,
+ NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
gtk_widget_set_sensitive(GTK_WIDGET(player->priv->range), seekable);
}
static void
-parole_player_set_playpause_button_from_stock(ParolePlayer *player, const gchar *stock_id)
-{
+parole_player_set_playpause_button_from_stock(ParolePlayer *player, const gchar *stock_id) {
gchar *icon_name = NULL, *tooltip = NULL;
if (g_strcmp0(stock_id, "gtk-media-play") == 0) {
@@ -1347,8 +1271,7 @@ parole_player_set_playpause_button_from_stock(ParolePlayer *player, const gchar
}
static void
-parole_player_save_uri(ParolePlayer *player, const ParoleStream *stream)
-{
+parole_player_save_uri(ParolePlayer *player, const ParoleStream *stream) {
ParoleMediaType media_type;
gchar *uri;
gboolean save = TRUE;
@@ -1356,37 +1279,31 @@ parole_player_save_uri(ParolePlayer *player, const ParoleStream *stream)
guint i;
g_object_get(G_OBJECT(stream),
- "uri", &uri,
- NULL);
+ "uri", &uri,
+ NULL);
g_object_get(G_OBJECT(stream),
- "media-type", &media_type,
- NULL);
+ "media-type", &media_type,
+ NULL);
- if ( media_type == PAROLE_MEDIA_TYPE_LOCAL_FILE )
- {
+ if ( media_type == PAROLE_MEDIA_TYPE_LOCAL_FILE ) {
gtk_recent_manager_add_item(player->priv->recent, uri);
goto out;
}
lines = parole_get_history();
- if (lines )
- {
- for ( i = 0; lines[i]; i++)
- {
- if ( !g_strcmp0 (lines[i], uri) )
- {
- save = FALSE;
- break;
+ if (lines) {
+ for (i = 0; lines[i]; i++) {
+ if (!g_strcmp0 (lines[i], uri)) {
+ save = FALSE;
+ break;
+ }
}
}
- }
- if ( media_type != PAROLE_MEDIA_TYPE_CDDA && media_type != PAROLE_MEDIA_TYPE_DVD )
- {
- if ( save )
- {
+ if ( media_type != PAROLE_MEDIA_TYPE_CDDA && media_type != PAROLE_MEDIA_TYPE_DVD ) {
+ if ( save ) {
parole_insert_line_history(uri);
}
}
@@ -1397,8 +1314,7 @@ out:
}
static void
-parole_player_playing(ParolePlayer *player, const ParoleStream *stream)
-{
+parole_player_playing(ParolePlayer *player, const ParoleStream *stream) {
gint64 duration;
gboolean seekable;
gboolean live;
@@ -1411,12 +1327,12 @@ parole_player_playing(ParolePlayer *player, const ParoleStream *stream)
parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PLAYING);
g_object_get(G_OBJECT(stream),
- "seekable", &seekable,
- "duration", &duration,
- "video-width", &width,
- "video-height", &height,
- "live", &live,
- NULL);
+ "seekable", &seekable,
+ "duration", &duration,
+ "video-width", &width,
+ "video-height", &height,
+ "live", &live,
+ NULL);
#ifdef HAVE_CLUTTER
if (player->priv->use_clutter)
@@ -1469,10 +1385,9 @@ parole_player_playing(ParolePlayer *player, const ParoleStream *stream)
parole_player_update_languages(player, PAROLE_GST(player->priv->gst));
g_object_get(G_OBJECT(player->priv->conf),
- "hide-controls-timeout", &hide_controls_timeout,
- NULL);
- if (hide_controls_timeout != 0 || player->priv->full_screen)
- {
+ "hide-controls-timeout", &hide_controls_timeout,
+ NULL);
+ if (hide_controls_timeout != 0 || player->priv->full_screen) {
if (player->priv->full_screen)
g_timeout_add_seconds(4, (GSourceFunc)parole_player_hide_controls, player);
else
@@ -1481,23 +1396,20 @@ parole_player_playing(ParolePlayer *player, const ParoleStream *stream)
}
static void
-parole_player_paused(ParolePlayer *player)
-{
+parole_player_paused(ParolePlayer *player) {
TRACE("Player paused");
parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_PAUSED);
g_simple_action_set_enabled(player->priv->media_playpause_action, TRUE);
- if ( player->priv->user_seeking == FALSE)
- {
+ if (player->priv->user_seeking == FALSE) {
parole_player_set_playpause_button_from_stock(player, "gtk-media-play");
}
}
static void
-parole_player_quit(ParolePlayer *player)
-{
+parole_player_quit(ParolePlayer *player) {
parole_media_list_save_list(player->priv->list);
parole_gst_shutdown(PAROLE_GST(player->priv->gst));
gtk_widget_destroy(player->priv->window);
@@ -1506,8 +1418,7 @@ parole_player_quit(ParolePlayer *player)
}
static void
-parole_player_stopped(ParolePlayer *player)
-{
+parole_player_stopped(ParolePlayer *player) {
GdkPixbuf *logo;
gchar dur_text[128];
TRACE("Player stopped");
@@ -1535,15 +1446,13 @@ parole_player_stopped(ParolePlayer *player)
parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
- if ( player->priv->exit )
- {
+ if ( player->priv->exit ) {
parole_player_quit(player);
}
}
static void
-parole_player_play_selected_row(ParolePlayer *player)
-{
+parole_player_play_selected_row(ParolePlayer *player) {
GtkTreeRowReference *row;
row = parole_media_list_get_selected_row(player->priv->list);
@@ -1556,8 +1465,7 @@ parole_player_play_selected_row(ParolePlayer *player)
}
static void
-parole_player_play_next(ParolePlayer *player, gboolean allow_shuffle)
-{
+parole_player_play_next(ParolePlayer *player, gboolean allow_shuffle) {
gboolean repeat, shuffle;
GtkTreeRowReference *row;
@@ -1593,8 +1501,7 @@ parole_player_play_next(ParolePlayer *player, gboolean allow_shuffle)
}
static void
-parole_player_play_prev(ParolePlayer *player)
-{
+parole_player_play_prev(ParolePlayer *player) {
GtkTreeRowReference *row;
if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ) {
@@ -1621,8 +1528,7 @@ parole_player_play_prev(ParolePlayer *player)
}
static void
-parole_player_reset_saver_changed(ParolePlayer *player, const ParoleStream *stream)
-{
+parole_player_reset_saver_changed(ParolePlayer *player, const ParoleStream *stream) {
gboolean reset_saver;
TRACE("Start");
@@ -1649,8 +1555,7 @@ parole_player_reset_saver_changed(ParolePlayer *player, const ParoleStream *stre
}
static void
-parole_player_media_state_cb(ParoleGst *gst, const ParoleStream *stream, ParoleState state, ParolePlayer *player)
-{
+parole_player_media_state_cb(ParoleGst *gst, const ParoleStream *stream, ParoleState state, ParolePlayer *player) {
PAROLE_DEBUG_ENUM("State callback", state, PAROLE_ENUM_TYPE_STATE);
player->priv->state = state;
@@ -1679,19 +1584,16 @@ parole_player_media_state_cb(ParoleGst *gst, const ParoleStream *stream, ParoleS
}
static void
-on_infobar_close_clicked(GtkButton *button, ParolePlayer *player)
-{
+on_infobar_close_clicked(GtkButton *button, ParolePlayer *player) {
gtk_widget_hide(player->priv->infobar);
}
static void
-parole_player_repeat_state_changed(GSimpleAction *simple, GVariant *value, ParolePlayer *player)
-{
+parole_player_repeat_state_changed(GSimpleAction *simple, GVariant *value, ParolePlayer *player) {
gboolean active = g_simple_toggle_action_get_active(simple);
block_playlist_updates = TRUE;
- if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(player->priv->repeat_menu_item)) != active)
- {
+ if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(player->priv->repeat_menu_item)) != active) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->repeat_menu_item), active);
}
@@ -1699,13 +1601,11 @@ parole_player_repeat_state_changed(GSimpleAction *simple, GVariant *value, Parol
}
static void
-parole_player_shuffle_state_changed(GSimpleAction *simple, GVariant *value, ParolePlayer *player)
-{
+parole_player_shuffle_state_changed(GSimpleAction *simple, GVariant *value, ParolePlayer *player) {
gboolean active = g_simple_toggle_action_get_active(simple);
block_playlist_updates = TRUE;
- if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(player->priv->shuffle_menu_item)) != active)
- {
+ if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(player->priv->shuffle_menu_item)) != active) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->shuffle_menu_item), active);
}
@@ -1713,8 +1613,7 @@ parole_player_shuffle_state_changed(GSimpleAction *simple, GVariant *value, Paro
}
static void
-parole_player_toggle_playpause(ParolePlayer *player)
-{
+parole_player_toggle_playpause(ParolePlayer *player) {
if ( player->priv->state == PAROLE_STATE_PLAYING )
parole_gst_pause(PAROLE_GST(player->priv->gst));
else if ( player->priv->state == PAROLE_STATE_PAUSED )
@@ -1724,31 +1623,25 @@ parole_player_toggle_playpause(ParolePlayer *player)
}
void
-parole_player_playpause_action_cb(GSimpleAction *action)
-{
+parole_player_playpause_action_cb(GSimpleAction *action) {
parole_player_toggle_playpause(parole_player);
}
void
-parole_player_pause_clicked(GtkButton *button, ParolePlayer *player)
-{
+parole_player_pause_clicked(GtkButton *button, ParolePlayer *player) {
parole_gst_pause(PAROLE_GST(player->priv->gst));
}
-void parole_player_next_action_cb(GSimpleAction *action)
-{
+void parole_player_next_action_cb(GSimpleAction *action) {
parole_player_play_next(parole_player, TRUE);
}
-void parole_player_previous_action_cb(GSimpleAction *action)
-{
+void parole_player_previous_action_cb(GSimpleAction *action) {
parole_player_play_prev(parole_player);
}
-GSimpleAction *parole_player_get_action(ParolePlayerAction action)
-{
- switch (action)
- {
+GSimpleAction *parole_player_get_action(ParolePlayerAction action) {
+ switch (action) {
case PAROLE_PLAYER_ACTION_PLAYPAUSE:
return playpause_action;
break;
@@ -1763,15 +1656,13 @@ GSimpleAction *parole_player_get_action(ParolePlayerAction action)
}
}
-void parole_player_seekf_cb(GtkWidget *widget, ParolePlayer *player, gdouble seek)
-{
+void parole_player_seekf_cb(GtkWidget *widget, ParolePlayer *player, gdouble seek) {
seek = parole_gst_get_stream_position(PAROLE_GST(player->priv->gst) ) + seek;
parole_gst_seek(PAROLE_GST(player->priv->gst), seek);
parole_player_change_range_value(player, seek);
}
-void parole_player_seekb_cb(GtkWidget *widget, ParolePlayer *player, gdouble seek)
-{
+void parole_player_seekb_cb(GtkWidget *widget, ParolePlayer *player, gdouble seek) {
seek = parole_gst_get_stream_position(PAROLE_GST(player->priv->gst) ) - seek;
if ( seek < 0 ) { seek = 0; }
parole_gst_seek(PAROLE_GST(player->priv->gst), seek);
@@ -1779,8 +1670,7 @@ void parole_player_seekb_cb(GtkWidget *widget, ParolePlayer *player, gdouble see
}
gboolean
-parole_player_range_button_release(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
-{
+parole_player_range_button_release(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player) {
ev->button = 2;
player->priv->user_seeking = FALSE;
@@ -1789,8 +1679,7 @@ parole_player_range_button_release(GtkWidget *widget, GdkEventButton *ev, Parole
}
gboolean
-parole_player_range_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
-{
+parole_player_range_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player) {
ev->button = 2;
player->priv->user_seeking = TRUE;
@@ -1799,12 +1688,10 @@ parole_player_range_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePl
}
void
-parole_player_range_value_changed(GtkRange *range, ParolePlayer *player)
-{
+parole_player_range_value_changed(GtkRange *range, ParolePlayer *player) {
gdouble value;
- if ( !player->priv->internal_range_change )
- {
+ if ( !player->priv->internal_range_change ) {
value = gtk_range_get_value(GTK_RANGE(range));
player->priv->user_seeking = TRUE;
TRACE("Sending a seek request with value :%e", value);
@@ -1814,16 +1701,14 @@ parole_player_range_value_changed(GtkRange *range, ParolePlayer *player)
}
static void
-parole_player_error_cb(ParoleGst *gst, const gchar *error, ParolePlayer *player)
-{
+parole_player_error_cb(ParoleGst *gst, const gchar *error, ParolePlayer *player) {
parole_dialog_error(GTK_WINDOW(player->priv->window), _("GStreamer backend error"), error);
parole_screen_saver_uninhibit(player->priv->screen_saver, GTK_WINDOW(player->priv->window));
parole_player_stopped(player);
}
static gchar *
-parole_player_get_filename_from_uri(gchar *uri)
-{
+parole_player_get_filename_from_uri(gchar *uri) {
gchar *filename = NULL;
gchar *scheme;
@@ -1834,8 +1719,7 @@ parole_player_get_filename_from_uri(gchar *uri)
regex = g_regex_new("^.*://.*/(?<filename>[^?#/]+)", 0, 0, NULL);
g_regex_match(regex, uri, 0, &match_info);
- if (g_match_info_matches (match_info))
- {
+ if (g_match_info_matches(match_info)) {
gchar *word = g_match_info_fetch_named(match_info, "filename");
filename = g_strdup(word);
g_free(word);
@@ -1855,8 +1739,7 @@ parole_player_get_filename_from_uri(gchar *uri)
}
static void
-parole_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePlayer *player)
-{
+parole_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePlayer *player) {
gchar *title;
gchar *album;
gchar *artist;
@@ -1925,8 +1808,7 @@ parole_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePla
}
static void
-parole_player_buffering_cb(ParoleGst *gst, const ParoleStream *stream, gint percentage, ParolePlayer *player)
-{
+parole_player_buffering_cb(ParoleGst *gst, const ParoleStream *stream, gint percentage, ParolePlayer *player) {
gchar *buff;
if ( percentage == 100 ) {
@@ -1959,8 +1841,7 @@ parole_player_buffering_cb(ParoleGst *gst, const ParoleStream *stream, gint perc
}
static void
-parole_player_dvd_chapter_count_change_cb(ParoleGst *gst, gint chapter_count, ParolePlayer *player)
-{
+parole_player_dvd_chapter_count_change_cb(ParoleGst *gst, gint chapter_count, ParolePlayer *player) {
gtk_tree_row_reference_free(player->priv->row);
player->priv->row = NULL;
@@ -1972,8 +1853,7 @@ parole_player_dvd_chapter_count_change_cb(ParoleGst *gst, gint chapter_count, Pa
}
static void
-parole_player_dvd_chapter_change_cb(ParoleGst *gst, gint chapter_count, ParolePlayer *player)
-{
+parole_player_dvd_chapter_change_cb(ParoleGst *gst, gint chapter_count, ParolePlayer *player) {
parole_media_list_set_row_playback_state(player->priv->list, player->priv->row, PAROLE_MEDIA_STATE_NONE);
player->priv->row = parole_media_list_get_row_n(player->priv->list, chapter_count-1);
@@ -1982,8 +1862,7 @@ parole_player_dvd_chapter_change_cb(ParoleGst *gst, gint chapter_count, ParolePl
parole_media_list_select_row(player->priv->list, player->priv->row);
}
-gboolean parole_player_delete_event_cb(GtkWidget *widget, GdkEvent *ev, ParolePlayer *player)
-{
+gboolean parole_player_delete_event_cb(GtkWidget *widget, GdkEvent *ev, ParolePlayer *player) {
parole_window_busy_cursor(gtk_widget_get_window(GTK_WIDGET(player->priv->window)));
player->priv->exit = TRUE;
@@ -1993,15 +1872,13 @@ gboolean parole_player_delete_event_cb(GtkWidget *widget, GdkEvent *ev, ParolePl
}
void
-parole_player_destroy_cb(GObject *window, ParolePlayer *player)
-{
+parole_player_destroy_cb(GObject *window, ParolePlayer *player) {
}
gboolean
parole_player_window_state_event(GtkWidget *widget,
- GdkEventWindowState *event,
- ParolePlayer *player)
-{
+ GdkEventWindowState *event,
+ ParolePlayer *player) {
gboolean fullscreen = FALSE;
if (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) {
@@ -2034,8 +1911,7 @@ parole_player_window_state_event(GtkWidget *widget,
* Reset the player controls based on existing conditions.
**/
void
-parole_player_reset_controls(ParolePlayer *player, gboolean fullscreen)
-{
+parole_player_reset_controls(ParolePlayer *player, gboolean fullscreen) {
static gint current_page = 0;
gboolean show_playlist;
@@ -2044,15 +1920,14 @@ parole_player_reset_controls(ParolePlayer *player, gboolean fullscreen)
gint h, w;
g_object_get(G_OBJECT(player->priv->conf),
- "always-hide-menubar", &always_hide_menubar,
- "window-height", &h,
- "window-width", &w,
- NULL);
+ "always-hide-menubar", &always_hide_menubar,
+ "window-height", &h,
+ "window-width", &w,
+ NULL);
if ( player->priv->full_screen != fullscreen ) {
/* If the player is in fullscreen mode, change to windowed mode. */
- if ( player->priv->full_screen )
- {
+ if ( player->priv->full_screen ) {
if (player->priv->show_menubar == TRUE)
gtk_widget_show(player->priv->menu_bar);
else if (always_hide_menubar == TRUE)
@@ -2130,8 +2005,7 @@ parole_player_reset_controls(ParolePlayer *player, gboolean fullscreen)
}
void
-parole_player_embedded(ParolePlayer *player)
-{
+parole_player_embedded(ParolePlayer *player) {
if ( player->priv->embedded == TRUE )
return;
@@ -2141,36 +2015,31 @@ parole_player_embedded(ParolePlayer *player)
}
void
-parole_player_full_screen(ParolePlayer *player, gboolean fullscreen)
-{
+parole_player_full_screen(ParolePlayer *player, gboolean fullscreen) {
if ( player->priv->full_screen == fullscreen )
return;
parole_player_reset_controls(player, fullscreen);
}
-void parole_player_fullscreen_action_cb(GSimpleAction *action)
-{
+void parole_player_fullscreen_action_cb(GSimpleAction *action) {
parole_player_full_screen(parole_player, !parole_player->priv->full_screen);
}
-static void parole_player_hide_menubar_cb(GtkWidget *widget, ParolePlayer *player)
-{
+static void parole_player_hide_menubar_cb(GtkWidget *widget, ParolePlayer *player) {
player->priv->show_menubar = !gtk_widget_get_visible(player->priv->menu_bar);
if (!player->priv->full_screen)
gtk_widget_set_visible(player->priv->menu_bar, player->priv->show_menubar);
}
-static void parole_player_toggle_mini_mode_cb(GtkWidget *widget, ParolePlayer *player)
-{
+static void parole_player_toggle_mini_mode_cb(GtkWidget *widget, ParolePlayer *player) {
gboolean active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
player->priv->mini_mode = active;
parole_player_reset_controls(player, FALSE);
}
static void
-parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
-{
+parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time) {
GtkWidget *menu, *mi;
gboolean sensitive;
GtkAccelGroup *accels = gtk_accel_group_new();
@@ -2220,8 +2089,7 @@ parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
g_signal_connect(G_OBJECT(mi), "activate", G_CALLBACK(parole_player_widget_activate_action), player->priv->media_fullscreen_action);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
- if (!player->priv->full_screen)
- {
+ if (!player->priv->full_screen) {
mi = gtk_separator_menu_item_new();
gtk_widget_show(GTK_WIDGET(mi));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
@@ -2268,8 +2136,7 @@ parole_player_show_menu(ParolePlayer *player, guint button, guint activate_time)
}
gboolean
-parole_player_gst_widget_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
-{
+parole_player_gst_widget_button_press(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player) {
gboolean ret_val = FALSE;
gboolean sensitive = FALSE;
gint w, h;
@@ -2283,8 +2150,7 @@ parole_player_gst_widget_button_press(GtkWidget *widget, GdkEventButton *ev, Par
w = gtk_widget_get_allocated_width(widget);
if ( (ev->x > ((w / 2) - 128) && ev->x < ((w / 2) + 128)) &&
- (ev->y > ((h / 2) - 128) && ev->y < ((h / 2) + 128)) )
- {
+ (ev->y > ((h / 2) - 128) && ev->y < ((h / 2) + 128)) ) {
g_object_get(G_OBJECT(player->priv->playpause_button),
"sensitive", &sensitive,
NULL);
@@ -2300,8 +2166,7 @@ parole_player_gst_widget_button_press(GtkWidget *widget, GdkEventButton *ev, Par
}
gboolean
-parole_player_gst_widget_button_release(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player)
-{
+parole_player_gst_widget_button_release(GtkWidget *widget, GdkEventButton *ev, ParolePlayer *player) {
gboolean ret_val = FALSE;
if ( ev->button == 3 ) {
@@ -2316,8 +2181,7 @@ parole_player_gst_widget_button_release(GtkWidget *widget, GdkEventButton *ev, P
return ret_val;
}
-gboolean parole_player_hide_controls(gpointer data)
-{
+gboolean parole_player_hide_controls(gpointer data) {
ParolePlayer *player;
TRACE("start");
@@ -2332,13 +2196,11 @@ gboolean parole_player_hide_controls(gpointer data)
}
gboolean
-parole_player_gst_widget_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev, ParolePlayer *player)
-{
+parole_player_gst_widget_motion_notify_event(GtkWidget *widget, GdkEventMotion *ev, ParolePlayer *player) {
static gulong hide_timeout;
int hide_controls_timeout;
- if ( hide_timeout != 0)
- {
+ if (hide_timeout != 0) {
g_source_remove_by_user_data(player);
hide_timeout = 0;
}
@@ -2372,65 +2234,55 @@ parole_player_gst_widget_motion_notify_event(GtkWidget *widget, GdkEventMotion *
}
void
-parole_player_menu_open_location_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_menu_open_location_cb(GtkWidget *widget, ParolePlayer *player) {
parole_media_list_open_location(player->priv->list);
}
void
-parole_player_menu_add_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_menu_add_cb(GtkWidget *widget, ParolePlayer *player) {
parole_media_list_open(player->priv->list);
}
void
-parole_player_save_playlist_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_save_playlist_cb(GtkWidget *widget, ParolePlayer *player) {
parole_media_list_save_cb(widget, player->priv->list);
}
void
-parole_player_media_menu_select_cb(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_media_menu_select_cb(GtkMenuItem *widget, ParolePlayer *player) {
gtk_widget_set_sensitive(player->priv->save_playlist,
!parole_media_list_is_empty(player->priv->list));
}
static void
-parole_player_playback_menu_select_cb(GtkMenuItem *widget, ParolePlayer *player)
-{
+parole_player_playback_menu_select_cb(GtkMenuItem *widget, ParolePlayer *player) {
gtk_widget_set_sensitive(player->priv->goto_position,
!parole_media_list_is_empty(player->priv->list));
}
-void parole_player_open_preferences_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_player_open_preferences_cb(GtkWidget *widget, ParolePlayer *player) {
parole_conf_dialog_open(player->priv->settings_dialog, player->priv->window);
}
void
-parole_player_menu_exit_cb(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_menu_exit_cb(GtkWidget *widget, ParolePlayer *player) {
parole_player_delete_event_cb(NULL, NULL, player);
}
static void
-parole_property_notify_cb_volume(ParoleGst *gst, GParamSpec *spec, ParolePlayer *player)
-{
+parole_property_notify_cb_volume(ParoleGst *gst, GParamSpec *spec, ParolePlayer *player) {
gdouble volume;
volume = parole_gst_get_volume(PAROLE_GST(player->priv->gst));
gtk_scale_button_set_value(GTK_SCALE_BUTTON(player->priv->volume), volume);
}
static void
-parole_player_change_volume(ParolePlayer *player, gdouble value)
-{
+parole_player_change_volume(ParolePlayer *player, gdouble value) {
parole_gst_set_volume(PAROLE_GST(player->priv->gst), value);
}
gboolean
-parole_player_volume_scroll_event_cb(GtkWidget *widget, GdkEventScroll *ev, ParolePlayer *player)
-{
+parole_player_volume_scroll_event_cb(GtkWidget *widget, GdkEventScroll *ev, ParolePlayer *player) {
gboolean ret_val = FALSE;
if ( ev->direction == GDK_SCROLL_UP ) {
@@ -2445,13 +2297,11 @@ parole_player_volume_scroll_event_cb(GtkWidget *widget, GdkEventScroll *ev, Paro
}
void
-parole_player_volume_value_changed_cb(GtkScaleButton *widget, gdouble value, ParolePlayer *player)
-{
+parole_player_volume_value_changed_cb(GtkScaleButton *widget, gdouble value, ParolePlayer *player) {
parole_player_change_volume(player, value);
/* Do not update the value unless it has changed! */
- if ((int)(value*100) != (int)(player->priv->last_volume*100))
- {
+ if ((int)(value*100) != (int)(player->priv->last_volume*100)) {
player->priv->last_volume = value;
if ( value > 0.0 )
g_object_set(G_OBJECT(player->priv->conf),
@@ -2461,23 +2311,20 @@ parole_player_volume_value_changed_cb(GtkScaleButton *widget, gdouble value, Par
}
void
-parole_player_volume_up(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_volume_up(GtkWidget *widget, ParolePlayer *player) {
gdouble value;
value = gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume));
gtk_scale_button_set_value(GTK_SCALE_BUTTON(player->priv->volume), value + 0.05);
}
void
-parole_player_volume_down(GtkWidget *widget, ParolePlayer *player)
-{
+parole_player_volume_down(GtkWidget *widget, ParolePlayer *player) {
gdouble value;
value = gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume));
gtk_scale_button_set_value(GTK_SCALE_BUTTON(player->priv->volume), value - 0.05);
}
-void parole_player_volume_mute(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_player_volume_mute(GtkWidget *widget, ParolePlayer *player) {
gint value;
if (gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume)) == 0.0) {
g_object_get(G_OBJECT(player->priv->conf),
@@ -2492,15 +2339,13 @@ void parole_player_volume_mute(GtkWidget *widget, ParolePlayer *player)
}
static void
-parole_player_sm_quit_requested_cb(ParolePlayer *player)
-{
+parole_player_sm_quit_requested_cb(ParolePlayer *player) {
player->priv->exit = TRUE;
parole_gst_terminate(PAROLE_GST(player->priv->gst));
}
static void
-parole_player_finalize(GObject *object)
-{
+parole_player_finalize(GObject *object) {
ParolePlayer *player;
player = PAROLE_PLAYER(object);
@@ -2528,15 +2373,13 @@ parole_player_finalize(GObject *object)
}
static void parole_player_set_property(GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec) {
ParolePlayer *player;
player = PAROLE_PLAYER(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_CLIENT_ID:
player->priv->client_id = g_value_dup_string(value);
break;
@@ -2547,15 +2390,13 @@ static void parole_player_set_property(GObject *object,
}
static void parole_player_get_property(GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec) {
ParolePlayer *player;
player = PAROLE_PLAYER(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_CLIENT_ID:
g_value_set_string(value, player->priv->client_id);
break;
@@ -2569,13 +2410,11 @@ static void parole_player_get_property(GObject *object,
* Get the SM client
**/
static void
-parole_player_constructed(GObject *object)
-{
+parole_player_constructed(GObject *object) {
ParolePlayer *player;
gchar *current_dir;
- const gchar *restart_command[] =
- {
+ const gchar *restart_command[] = {
"parole",
"--new-instance",
NULL
@@ -2592,8 +2431,7 @@ parole_player_constructed(GObject *object)
restart_command,
DESKTOPDIR "/org.xfce.Parole.desktop");
- if ( xfce_sm_client_connect (player->priv->sm_client, NULL ) )
- {
+ if (xfce_sm_client_connect(player->priv->sm_client, NULL)) {
g_signal_connect_swapped(player->priv->sm_client, "quit-requested",
G_CALLBACK(parole_player_sm_quit_requested_cb), player);
}
@@ -2602,8 +2440,7 @@ parole_player_constructed(GObject *object)
}
static void
-parole_player_class_init(ParolePlayerClass *klass)
-{
+parole_player_class_init(ParolePlayerClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->constructed = parole_player_constructed;
@@ -2638,8 +2475,7 @@ parole_player_class_init(ParolePlayerClass *klass)
*
*/
static void
-parole_player_reset_saver_changed_cb(ParolePlayer *player)
-{
+parole_player_reset_saver_changed_cb(ParolePlayer *player) {
const ParoleStream *stream;
stream = parole_gst_get_stream(PAROLE_GST(player->priv->gst));
@@ -2648,8 +2484,7 @@ parole_player_reset_saver_changed_cb(ParolePlayer *player)
}
static gboolean
-parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
-{
+parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player) {
GtkWidget *focused;
/* Seek duration in seconds */
gdouble seek_short = 10, seek_medium = 60, seek_long = 600;
@@ -2658,10 +2493,8 @@ parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
focused = gtk_window_get_focus(GTK_WINDOW(player->priv->window));
- if ( focused )
- {
- if ( gtk_widget_is_ancestor (focused, player->priv->playlist_nt) )
- {
+ if ( focused ) {
+ if (gtk_widget_is_ancestor(focused, player->priv->playlist_nt)) {
return FALSE;
}
}
@@ -2669,8 +2502,7 @@ parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
if (ev->state & GDK_MOD1_MASK)
return FALSE;
- switch (ev->keyval)
- {
+ switch (ev->keyval) {
case GDK_KEY_f:
case GDK_KEY_F:
if ( player->priv->embedded != TRUE ) {
@@ -2686,8 +2518,7 @@ parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
break;
case GDK_KEY_Right:
/* Media seekable ?*/
- if ( gtk_widget_get_sensitive (player->priv->range) )
- {
+ if (gtk_widget_get_sensitive(player->priv->range)) {
if (ev->state & GDK_CONTROL_MASK) {
parole_player_seekf_cb(NULL, player, seek_medium);
} else {
@@ -2697,8 +2528,7 @@ parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
ret_val = TRUE;
break;
case GDK_KEY_Left:
- if ( gtk_widget_get_sensitive (player->priv->range) )
- {
+ if (gtk_widget_get_sensitive(player->priv->range)) {
if (ev->state & GDK_CONTROL_MASK) {
parole_player_seekb_cb(NULL, player, seek_medium);
} else {
@@ -2769,14 +2599,12 @@ parole_player_handle_key_press(GdkEventKey *ev, ParolePlayer *player)
}
gboolean
-parole_player_key_press(GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player)
-{
+parole_player_key_press(GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player) {
gboolean enabled;
- switch (ev->keyval)
- {
+ switch (ev->keyval) {
case GDK_KEY_F11:
- if ( player->priv->embedded != TRUE ) g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
+ if ( player->priv->embedded != TRUE ) g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
return TRUE;
default:
break;
@@ -2784,12 +2612,10 @@ parole_player_key_press(GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player
#ifdef HAVE_XF86_KEYSYM
g_object_get(G_OBJECT(player->priv->conf),
- "multimedia-keys", &enabled,
- NULL);
- if (enabled)
- {
- switch (ev->keyval)
- {
+ "multimedia-keys", &enabled,
+ NULL);
+ if (enabled) {
+ switch (ev->keyval) {
case XF86XK_AudioPlay:
parole_player_toggle_playpause(player);
return TRUE;
@@ -2822,21 +2648,19 @@ parole_player_key_press(GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player
#ifdef HAVE_XF86_KEYSYM
static void
-parole_player_button_pressed_cb(ParoleButton *button, ParoleButtonKey key, ParolePlayer *player)
-{
+parole_player_button_pressed_cb(ParoleButton *button, ParoleButtonKey key, ParolePlayer *player) {
gboolean enabled;
g_object_get(G_OBJECT(player->priv->conf),
- "multimedia-keys", &enabled,
- NULL);
+ "multimedia-keys", &enabled,
+ NULL);
if (!enabled)
return;
PAROLE_DEBUG_ENUM("Button Press:", key, ENUM_GTYPE_BUTTON_KEY);
- switch (key)
- {
+ switch (key) {
case PAROLE_KEY_AUDIO_PLAY:
parole_player_toggle_playpause(player);
break;
@@ -2856,17 +2680,15 @@ parole_player_button_pressed_cb(ParoleButton *button, ParoleButtonKey key, Parol
#endif
static void
-parole_gst_set_default_aspect_ratio(ParolePlayer *player, GtkBuilder *builder)
-{
+parole_gst_set_default_aspect_ratio(ParolePlayer *player, GtkBuilder *builder) {
ParoleAspectRatio ratio;
const gchar *widget_name;
g_object_get(G_OBJECT(player->priv->conf),
- "aspect-ratio", &ratio,
- NULL);
+ "aspect-ratio", &ratio,
+ NULL);
- switch (ratio )
- {
+ switch (ratio) {
case PAROLE_ASPECT_RATIO_NONE:
widget_name = "ratio_none";
break;
@@ -2894,8 +2716,7 @@ parole_gst_set_default_aspect_ratio(ParolePlayer *player, GtkBuilder *builder)
}
static void
-on_bug_report_clicked(GtkWidget *w, ParolePlayer *player)
-{
+on_bug_report_clicked(GtkWidget *w, ParolePlayer *player) {
GtkWidget *dialog;
#if GTK_CHECK_VERSION(3, 22, 0)
if (!gtk_show_uri_on_window(GTK_WINDOW(player->priv->window), "https://docs.xfce.org/apps/parole/bugs", GDK_CURRENT_TIME, NULL)) {
@@ -2915,14 +2736,12 @@ on_bug_report_clicked(GtkWidget *w, ParolePlayer *player)
}
static void
-on_contents_clicked(GtkWidget *w, ParolePlayer *player)
-{
+on_contents_clicked(GtkWidget *w, ParolePlayer *player) {
xfce_dialog_show_help_with_version(NULL, "parole", "start", NULL, PAROLE_VERSION_SHORT);
}
static gboolean
-on_goto_position_clicked(GtkWidget *w, ParolePlayer *player)
-{
+on_goto_position_clicked(GtkWidget *w, ParolePlayer *player) {
GtkWidget *dialog;
GtkWidget *vbox, *hbox, *label;
GtkWidget *spin_hrs, *spin_mins, *spin_secs;
@@ -2978,8 +2797,7 @@ on_goto_position_clicked(GtkWidget *w, ParolePlayer *player)
if ( duration == 0 )
gtk_widget_set_sensitive(GTK_WIDGET(spin_secs), FALSE);
- if ( current_position != 0 )
- {
+ if ( current_position != 0 ) {
cur_hrs = (int) current_position/3600;
cur_mins = (int) current_position/60 - cur_hrs*60;
cur_secs = (int) current_position - cur_hrs*3600 - cur_mins*60;
@@ -2992,8 +2810,7 @@ on_goto_position_clicked(GtkWidget *w, ParolePlayer *player)
/* show dialog */
gtk_widget_show_all(dialog);
response = gtk_dialog_run(GTK_DIALOG(dialog));
- if (response == GTK_RESPONSE_OK)
- {
+ if (response == GTK_RESPONSE_OK) {
/* update range according to the value */
hrs = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_hrs));
mins = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_mins));
@@ -3017,8 +2834,7 @@ on_goto_position_clicked(GtkWidget *w, ParolePlayer *player)
* NOTE: Transparency is not supported, so there's also no fadeout.
**/
static gboolean
-parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
-{
+parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
GtkStyleContext *context;
#if GTK_CHECK_VERSION(3, 16, 0)
@@ -3052,8 +2868,7 @@ parole_overlay_expose_event(GtkWidget *widget, cairo_t *cr, gpointer user_data)
/* This function allows smoothly adjusting the window alignment with coverart */
static gboolean
-parole_audiobox_expose_event(GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player)
-{
+parole_audiobox_expose_event(GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player) {
GtkAllocation *allocation = g_new0(GtkAllocation, 1);
gboolean homogeneous;
@@ -3080,37 +2895,32 @@ parole_audiobox_expose_event(GtkWidget *w, GdkEventExpose *ev, ParolePlayer *pla
}
void
-on_content_area_size_allocate(GtkWidget *widget, GtkAllocation *allocation, ParolePlayer *player)
-{
+on_content_area_size_allocate(GtkWidget *widget, GtkAllocation *allocation, ParolePlayer *player) {
g_return_if_fail(allocation != NULL);
gtk_widget_set_allocation(widget, allocation);
- if ( gtk_widget_get_realized (widget) )
- {
+ if (gtk_widget_get_realized(widget)) {
gtk_widget_queue_draw(widget);
}
}
gboolean
-parole_player_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, ParolePlayer *player)
-{
+parole_player_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, ParolePlayer *player) {
gint old_w, old_h, new_w, new_h;
/* Get the current window size */
gtk_window_get_size(GTK_WINDOW(widget), &new_w, &new_h);
- if ( !player->priv->full_screen )
- {
+ if ( !player->priv->full_screen ) {
/* Store the previously saved window size in case of maximize */
g_object_get(G_OBJECT(player->priv->conf),
- "window-width", &old_w,
- "window-height", &old_h,
- NULL);
+ "window-width", &old_w,
+ "window-height", &old_h,
+ NULL);
/* Configure gets run twice, only change on update */
- if (old_w != new_w || old_h != new_h)
- {
+ if (old_w != new_w || old_h != new_h) {
player->priv->last_w = old_w;
player->priv->last_h = old_h;
@@ -3127,14 +2937,13 @@ parole_player_configure_event_cb(GtkWidget *widget, GdkEventConfigure *ev, Parol
static void
parole_player_drag_data_received_cb(GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint drag_time,
- ParolePlayer *player)
-{
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint drag_time,
+ ParolePlayer *player) {
gchar **uri_list;
guint added = 0;
guint i;
@@ -3142,8 +2951,7 @@ parole_player_drag_data_received_cb(GtkWidget *widget,
parole_window_busy_cursor(gtk_widget_get_window(widget));
uri_list = g_uri_list_extract_uris((const gchar *)gtk_selection_data_get_data(data));
- for ( i = 0; uri_list[i] != NULL; i++)
- {
+ for (i = 0; uri_list[i] != NULL; i++) {
gchar *path;
path = g_filename_from_uri(uri_list[i], NULL, NULL);
added += parole_media_list_add_by_path(player->priv->list, path, i == 0 ? TRUE : FALSE);
@@ -3158,8 +2966,7 @@ parole_player_drag_data_received_cb(GtkWidget *widget,
}
static void
-parole_player_set_cursor_visible(ParolePlayer *player, gboolean visible)
-{
+parole_player_set_cursor_visible(ParolePlayer *player, gboolean visible) {
GdkWindow *gdkwindow;
gdkwindow = gtk_widget_get_window(GTK_WIDGET(player->priv->eventbox_output));
@@ -3173,8 +2980,7 @@ parole_player_set_cursor_visible(ParolePlayer *player, gboolean visible)
}
static void
-parole_player_window_notify_is_active(ParolePlayer *player)
-{
+parole_player_window_notify_is_active(ParolePlayer *player) {
if (!gtk_window_is_active(GTK_WINDOW(player->priv->window))) {
parole_player_set_cursor_visible(player, TRUE);
} else {
@@ -3192,8 +2998,7 @@ parole_player_window_notify_is_active(ParolePlayer *player)
* NOTE: The widget has to be realized first.
**/
static void
-parole_player_set_wm_opacity_hint(GtkWidget *widget)
-{
+parole_player_set_wm_opacity_hint(GtkWidget *widget) {
GdkScreen *gdkscreen;
GdkDisplay *gdkdisplay;
GdkWindow *gdkwindow;
@@ -3221,8 +3026,7 @@ parole_player_set_wm_opacity_hint(GtkWidget *widget)
}
static void
-parole_player_init(ParolePlayer *player)
-{
+parole_player_init(ParolePlayer *player) {
/* Builder */
GtkBuilder *builder;
@@ -3876,21 +3680,16 @@ parole_player_init(ParolePlayer *player)
}
ParolePlayer *
-parole_player_new(const gchar *client_id)
-{
+parole_player_new(const gchar *client_id) {
parole_player = g_object_new(PAROLE_TYPE_PLAYER, "client-id", client_id, NULL);
return parole_player;
}
-ParoleMediaList *parole_player_get_media_list(ParolePlayer *player)
-{
+ParoleMediaList *parole_player_get_media_list(ParolePlayer *player) {
return player->priv->list;
}
-
-
-void parole_player_play_uri_disc(ParolePlayer *player, const gchar *uri, const gchar *device)
-{
+void parole_player_play_uri_disc(ParolePlayer *player, const gchar *uri, const gchar *device) {
if ( uri ) {
parole_player_disc_selected_cb(NULL, uri, device, player);
} else if (device) {
@@ -3902,15 +3701,13 @@ void parole_player_play_uri_disc(ParolePlayer *player, const gchar *uri, const g
}
}
-void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player, gint audio_index)
-{
+void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player, gint audio_index) {
GList *menu_items, *menu_iter;
gint counter = 0;
menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->languages_menu));
- for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
- {
+ for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) {
if (counter == audio_index) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
break;
@@ -3920,8 +3717,7 @@ void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player,
g_list_free(menu_items);
}
-void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint sub_index)
-{
+void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint sub_index) {
GList *menu_items, *menu_iter;
menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->subtitles_menu));
@@ -3929,8 +3725,7 @@ void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, g
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items->data), TRUE);
} else {
gint counter = -3;
- for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
- {
+ for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) {
if (counter == sub_index) {
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
break;
@@ -3941,8 +3736,7 @@ void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, g
g_list_free(menu_items);
}
-void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player) {
gint radio_index = 0;
GList *menu_items, *menu_iter;
gint counter = 0;
@@ -3950,8 +3744,7 @@ void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, Paro
menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->languages_menu));
- for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
- {
+ for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) {
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
radio_index = counter;
break;
@@ -3965,8 +3758,7 @@ void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, Paro
gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack), radio_index);
}
-void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player) {
gint radio_index = 0;
gint combobox_index = 0;
gint counter = 0;
@@ -3974,10 +3766,8 @@ void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, Parol
GList *menu_items, *menu_iter;
menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->subtitles_menu));
- for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
- {
- if (counter == 0 || counter > 3)
- {
+ for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter)) {
+ if (counter == 0 || counter > 3) {
if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
radio_index = counter;
break;
@@ -3995,8 +3785,7 @@ void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, Parol
gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), radio_index);
}
-void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlayer *player) {
gint audio_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
if (player->priv->update_languages == FALSE)
gst_set_current_audio_track(PAROLE_GST(player->priv->gst), audio_index);
@@ -4004,8 +3793,7 @@ void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlay
}
static gboolean
-get_has_file_extension(gchar* filename, gchar* extension)
-{
+get_has_file_extension(gchar* filename, gchar* extension) {
gchar *lowercase = NULL;
gboolean has_ext;
@@ -4018,8 +3806,7 @@ get_has_file_extension(gchar* filename, gchar* extension)
return has_ext;
}
-void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, ParolePlayer *player)
-{
+void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, ParolePlayer *player) {
gchar *uri = parole_gst_get_file_uri(PAROLE_GST(player->priv->gst));
gint sub_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
@@ -4032,8 +3819,7 @@ void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, ParolePlaye
parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
}
-void parole_player_terminate(ParolePlayer *player)
-{
+void parole_player_terminate(ParolePlayer *player) {
parole_player_delete_event_cb(NULL, NULL, player);
}
@@ -4070,80 +3856,61 @@ static gboolean parole_player_dbus_play_disc(ParolePlayer *player,
* DBus server implementation
*/
static void
-parole_player_dbus_class_init(ParolePlayerClass *klass)
-{
+parole_player_dbus_class_init(ParolePlayerClass *klass) {
dbus_g_object_type_install_info(G_TYPE_FROM_CLASS(klass),
&dbus_glib_parole_player_object_info);
}
static void
-parole_player_dbus_init(ParolePlayer *player)
-{
+parole_player_dbus_init(ParolePlayer *player) {
dbus_g_connection_register_g_object(player->priv->bus,
- PAROLE_DBUS_PATH,
- G_OBJECT(player));
+ PAROLE_DBUS_PATH,
+ G_OBJECT(player));
}
-static gboolean parole_player_dbus_play(ParolePlayer *player,
- GError *error)
-{
+static gboolean parole_player_dbus_play(ParolePlayer *player, GError *error) {
parole_player_toggle_playpause(player);
return TRUE;
}
-static gboolean parole_player_dbus_next_track(ParolePlayer *player,
- GError *error)
-{
+static gboolean parole_player_dbus_next_track(ParolePlayer *player, GError *error) {
parole_player_play_next(player, TRUE);
return TRUE;
}
-static gboolean parole_player_dbus_prev_track(ParolePlayer *player,
- GError *error)
-{
+static gboolean parole_player_dbus_prev_track(ParolePlayer *player, GError *error) {
parole_player_play_prev(player);
return TRUE;
}
-static gboolean parole_player_dbus_raise_volume(ParolePlayer *player,
- GError *error)
-{
+static gboolean parole_player_dbus_raise_volume(ParolePlayer *player, GError *error) {
parole_player_volume_up(NULL, player);
return TRUE;
}
-static gboolean parole_player_dbus_lower_volume(ParolePlayer *player,
- GError *error)
-{
+static gboolean parole_player_dbus_lower_volume(ParolePlayer *player, GError *error) {
parole_player_volume_down(NULL, player);
return TRUE;
}
-static gboolean parole_player_dbus_mute(ParolePlayer *player,
- GError *error)
-{
- if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) != 0.0)
- {
+static gboolean parole_player_dbus_mute(ParolePlayer *player, GError *error) {
+ if (gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume)) != 0.0) {
parole_player_volume_mute(NULL, player);
}
return TRUE;
}
-static gboolean parole_player_dbus_unmute(ParolePlayer *player,
- GError *error)
-{
- if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) == 0.0)
- {
+static gboolean parole_player_dbus_unmute(ParolePlayer *player, GError *error) {
+ if (gtk_scale_button_get_value(GTK_SCALE_BUTTON(player->priv->volume)) == 0.0) {
parole_player_volume_mute(NULL, player);
}
return TRUE;
}
static gboolean parole_player_dbus_play_disc(ParolePlayer *player,
- gchar *in_uri,
- gchar *in_device,
- GError **error)
-{
+ gchar *in_uri,
+ gchar *in_device,
+ GError **error) {
TRACE("uri : %s", in_uri);
gtk_window_present(GTK_WINDOW(player->priv->window));
diff --git a/src/parole-player.h b/src/parole-player.h
index 876d1a6..242d7e3 100644
--- a/src/parole-player.h
+++ b/src/parole-player.h
@@ -34,14 +34,12 @@ G_BEGIN_DECLS
typedef struct ParolePlayerPrivate ParolePlayerPrivate;
-typedef struct
-{
+typedef struct {
GObject parent;
ParolePlayerPrivate *priv;
} ParolePlayer;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
void (*shuffle_toggled) (ParolePlayer *player,
@@ -54,8 +52,7 @@ typedef struct
gint gst_dvd_nav_message);
} ParolePlayerClass;
-typedef enum
-{
+typedef enum {
PAROLE_PLAYER_ACTION_PREVIOUS,
PAROLE_PLAYER_ACTION_NEXT,
PAROLE_PLAYER_ACTION_PLAYPAUSE
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 66e4f40..39a116c 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -44,8 +44,7 @@ static void parole_plugin_player_finalize(GObject *object);
#define PAROLE_PLUGIN_PLAYER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_PLUGIN_PLAYER, ParolePluginPlayerPrivate))
-struct ParolePluginPlayerPrivate
-{
+struct ParolePluginPlayerPrivate {
GtkWidget *gst;
GtkWidget *box;
@@ -61,8 +60,7 @@ G_DEFINE_TYPE_WITH_CODE(ParolePluginPlayer, parole_plugin_player, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLAYER, parole_plugin_player_iface_init))
static void
-parole_plugin_player_send_message(const gchar *message)
-{
+parole_plugin_player_send_message(const gchar *message) {
DBusGProxy *proxy;
proxy = parole_get_proxy(PAROLE_DBUS_PATH, PAROLE_DBUS_INTERFACE);
@@ -75,8 +73,7 @@ parole_plugin_player_send_message(const gchar *message)
}
static GtkWidget *
-parole_plugin_player_get_main_window(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_get_main_window(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -85,8 +82,7 @@ parole_plugin_player_get_main_window(ParoleProviderPlayer *provider)
static void
parole_plugin_player_pack_widget(ParoleProviderPlayer *provider, GtkWidget *widget,
- const gchar *title, ParolePluginContainer container_type)
-{
+ const gchar *title, ParolePluginContainer container_type) {
ParolePluginPlayer *player;
ParolePluginsManager *manager;
@@ -102,8 +98,7 @@ parole_plugin_player_pack_widget(ParoleProviderPlayer *provider, GtkWidget *widg
}
static ParoleState
-parole_plugin_player_get_state(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_get_state(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -112,8 +107,7 @@ parole_plugin_player_get_state(ParoleProviderPlayer *provider)
}
static const ParoleStream *
-parole_plugin_player_get_stream(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_get_stream(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -122,8 +116,7 @@ parole_plugin_player_get_stream(ParoleProviderPlayer *provider)
}
static gboolean
-parole_plugin_player_play_uri(ParoleProviderPlayer *provider, const gchar *uri)
-{
+parole_plugin_player_play_uri(ParoleProviderPlayer *provider, const gchar *uri) {
ParoleMediaList *list;
list = PAROLE_MEDIA_LIST(parole_media_list_get());
@@ -135,8 +128,7 @@ parole_plugin_player_play_uri(ParoleProviderPlayer *provider, const gchar *uri)
}
static gboolean
-parole_plugin_player_pause(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_pause(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -147,8 +139,7 @@ parole_plugin_player_pause(ParoleProviderPlayer *provider)
}
static gboolean
-parole_plugin_player_resume(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_resume(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -159,8 +150,7 @@ parole_plugin_player_resume(ParoleProviderPlayer *provider)
}
static gboolean
-parole_plugin_player_stop(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_stop(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -171,24 +161,21 @@ parole_plugin_player_stop(ParoleProviderPlayer *provider)
}
static gboolean
-parole_plugin_player_play_previous(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_play_previous(ParoleProviderPlayer *provider) {
parole_plugin_player_send_message("PrevTrack");
return TRUE;
}
static gboolean
-parole_plugin_player_play_next(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_play_next(ParoleProviderPlayer *provider) {
parole_plugin_player_send_message("NextTrack");
return TRUE;
}
static gboolean
-parole_plugin_player_seek(ParoleProviderPlayer *provider, gdouble pos)
-{
+parole_plugin_player_seek(ParoleProviderPlayer *provider, gdouble pos) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -199,8 +186,7 @@ parole_plugin_player_seek(ParoleProviderPlayer *provider, gdouble pos)
}
static gdouble
-parole_plugin_player_get_stream_position(ParoleProviderPlayer *provider)
-{
+parole_plugin_player_get_stream_position(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
gdouble position = 0;
@@ -212,8 +198,7 @@ parole_plugin_player_get_stream_position(ParoleProviderPlayer *provider)
return position*1000000.0;
}
-static void parole_plugin_player_open_media_chooser(ParoleProviderPlayer *provider)
-{
+static void parole_plugin_player_open_media_chooser(ParoleProviderPlayer *provider) {
ParoleMediaList *list;
list = PAROLE_MEDIA_LIST(parole_media_list_get());
@@ -222,13 +207,11 @@ static void parole_plugin_player_open_media_chooser(ParoleProviderPlayer *provid
g_object_unref(list);
}
-static GSimpleAction* parole_plugin_player_get_action(ParoleProviderPlayer *provider, ParolePlayerAction action)
-{
+static GSimpleAction* parole_plugin_player_get_action(ParoleProviderPlayer *provider, ParolePlayerAction action) {
return parole_player_get_action (action);
}
-static gboolean parole_plugin_player_get_fullscreen(ParoleProviderPlayer *provider)
-{
+static gboolean parole_plugin_player_get_fullscreen(ParoleProviderPlayer *provider) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(provider);
@@ -236,8 +219,7 @@ static gboolean parole_plugin_player_get_fullscreen(ParoleProviderPlayer *provid
return player->priv->fullscreen;
}
-static gboolean parole_plugin_player_set_fullscreen(ParoleProviderPlayer *provider, gboolean fullscreen)
-{
+static gboolean parole_plugin_player_set_fullscreen(ParoleProviderPlayer *provider, gboolean fullscreen) {
GtkWidget *window;
window = parole_plugin_player_get_main_window(provider);
@@ -250,8 +232,7 @@ static gboolean parole_plugin_player_set_fullscreen(ParoleProviderPlayer *provid
return TRUE;
}
-static void parole_plugin_player_iface_init(ParoleProviderPlayerIface *iface)
-{
+static void parole_plugin_player_iface_init(ParoleProviderPlayerIface *iface) {
iface->get_main_window = parole_plugin_player_get_main_window;
iface->pack = parole_plugin_player_pack_widget;
iface->get_state = parole_plugin_player_get_state;
@@ -272,28 +253,24 @@ static void parole_plugin_player_iface_init(ParoleProviderPlayerIface *iface)
static void
parole_plugin_player_media_state_changed_cb(ParoleGst *gst, const ParoleStream *stream,
- ParoleState state, ParolePluginPlayer *player)
-{
+ ParoleState state, ParolePluginPlayer *player) {
g_signal_emit_by_name(G_OBJECT(player), "state-changed", stream, state);
}
static void
-parole_plugin_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePluginPlayer *player)
-{
+parole_plugin_player_media_tag_cb(ParoleGst *gst, const ParoleStream *stream, ParolePluginPlayer *player) {
g_signal_emit_by_name(G_OBJECT(player), "tag-message", stream);
}
static void
-parole_plugin_player_media_seeked_cb(ParoleGst *gst, ParolePluginPlayer *player)
-{
+parole_plugin_player_media_seeked_cb(ParoleGst *gst, ParolePluginPlayer *player) {
g_signal_emit_by_name(G_OBJECT(player), "seeked");
}
static gboolean
parole_plugin_player_window_state_event(GtkWidget *widget,
- GdkEventWindowState *event,
- ParolePluginPlayer *player)
-{
+ GdkEventWindowState *event,
+ ParolePluginPlayer *player) {
if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
player->priv->fullscreen = TRUE;
else
@@ -302,8 +279,7 @@ parole_plugin_player_window_state_event(GtkWidget *widget,
}
static void
-parole_plugin_player_class_init(ParolePluginPlayerClass *klass)
-{
+parole_plugin_player_class_init(ParolePluginPlayerClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_plugin_player_finalize;
@@ -312,8 +288,7 @@ parole_plugin_player_class_init(ParolePluginPlayerClass *klass)
}
static void
-parole_plugin_player_init(ParolePluginPlayer *player)
-{
+parole_plugin_player_init(ParolePluginPlayer *player) {
GtkWidget *window;
player->priv = PAROLE_PLUGIN_PLAYER_GET_PRIVATE(player);
@@ -340,14 +315,12 @@ parole_plugin_player_init(ParolePluginPlayer *player)
}
static void
-parole_plugin_player_finalize(GObject *object)
-{
+parole_plugin_player_finalize(GObject *object) {
ParolePluginPlayer *player;
player = PAROLE_PLUGIN_PLAYER(object);
- if ( G_IS_OBJECT (player->priv->gst) )
- {
+ if (G_IS_OBJECT(player->priv->gst)) {
if (g_signal_handler_is_connected (player->priv->gst, player->priv->state_changed))
g_signal_handler_disconnect(player->priv->gst, player->priv->state_changed);
@@ -365,8 +338,7 @@ parole_plugin_player_finalize(GObject *object)
}
ParolePluginPlayer *
-parole_plugin_player_new(void)
-{
+parole_plugin_player_new(void) {
ParolePluginPlayer *player = NULL;
player = g_object_new(PAROLE_TYPE_PLUGIN_PLAYER, NULL);
diff --git a/src/parole-plugin-player.h b/src/parole-plugin-player.h
index f39c452..33c4a14 100644
--- a/src/parole-plugin-player.h
+++ b/src/parole-plugin-player.h
@@ -33,14 +33,12 @@ G_BEGIN_DECLS
typedef struct ParolePluginPlayerPrivate ParolePluginPlayerPrivate;
-typedef struct
-{
+typedef struct {
GObject parent;
ParolePluginPlayerPrivate *priv;
} ParolePluginPlayer;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
} ParolePluginPlayerClass;
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index 9b85145..a774390 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -52,16 +52,14 @@
#define PAROLE_PLUGIN_EXT = ".desktop"
-typedef struct
-{
+typedef struct {
gchar *name;
gchar *authors;
gchar *desc;
gchar *website;
} ParolePluginInfo;
-typedef struct
-{
+typedef struct {
ParolePluginsManager *manager;
GtkWidget *window;
@@ -99,8 +97,7 @@ static void parole_plugins_manager_set_property(GObject *object,
#define PAROLE_PLUGINS_MANAGER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), PAROLE_TYPE_PLUGINS_MANAGER, ParolePluginsManagerPrivate))
-struct ParolePluginsManagerPrivate
-{
+struct ParolePluginsManagerPrivate {
GtkWidget *list_nt;
GtkWidget *main_window;
@@ -115,31 +112,25 @@ static gpointer parole_plugins_manager_object = NULL;
G_DEFINE_TYPE(ParolePluginsManager, parole_plugins_manager, G_TYPE_OBJECT)
-enum
-{
+enum {
COL_ACTIVE,
COL_PLUGIN,
COL_MODULE,
COL_INFO
};
-enum
-{
+enum {
PROP_0,
PROP_LOAD_PLUGIN
};
-void parole_plugins_manager_pref_response_cb(GtkDialog *dialog,
- gint reponse_id,
- PrefData *pref)
-{
+void parole_plugins_manager_pref_response_cb(GtkDialog *dialog, gint reponse_id, PrefData *pref) {
GtkTreeIter iter;
gboolean valid;
for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (pref->store), &iter);
valid;
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(pref->store), &iter) )
- {
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(pref->store), &iter) ) {
ParolePluginInfo *info;
gtk_tree_model_get(GTK_TREE_MODEL(pref->store),
&iter,
@@ -157,23 +148,20 @@ void parole_plugins_manager_pref_response_cb(GtkDialog *dialog,
}
static void
-parole_plugins_manager_get_selected_module_data(PrefData *pref, ParoleProviderModule **module, ParolePluginInfo **info)
-{
+parole_plugins_manager_get_selected_module_data(PrefData *pref, ParoleProviderModule **module, ParolePluginInfo **info) {
GtkTreeModel *model;
GtkTreeSelection *sel;
GtkTreeIter iter;
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(pref->view));
- if ( !sel )
- {
+ if ( !sel ) {
*module = NULL;
*info = NULL;
return;
}
- if ( !gtk_tree_selection_get_selected (sel, &model, &iter))
- {
+ if (!gtk_tree_selection_get_selected(sel, &model, &iter)) {
*module = NULL;
*info = NULL;
return;
@@ -185,8 +173,7 @@ parole_plugins_manager_get_selected_module_data(PrefData *pref, ParoleProviderMo
-1);
}
-void parole_plugins_manager_show_configure(GtkButton *button, PrefData *pref)
-{
+void parole_plugins_manager_show_configure(GtkButton *button, PrefData *pref) {
ParoleProviderModule *module;
ParolePluginInfo *info;
@@ -199,8 +186,7 @@ void parole_plugins_manager_show_configure(GtkButton *button, PrefData *pref)
}
static void
-parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, gboolean active)
-{
+parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, gboolean active) {
gchar **saved_plugins;
gchar **plugins_rc;
guint num = 0, i, count = 0;
@@ -213,8 +199,7 @@ parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, g
if ( active ) {
plugins_rc = g_new0(gchar *, num + 2);
- for ( i = 0; i < num; i++)
- {
+ for (i = 0; i < num; i++) {
plugins_rc[i] = g_strdup(saved_plugins[i]);
}
@@ -224,8 +209,7 @@ parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, g
} else {
plugins_rc = g_new0(gchar *, num + 1);
- for ( i = 0; i < num; i++)
- {
+ for (i = 0; i < num; i++) {
if ( g_strcmp0(saved_plugins[i], filename) != 0 ) {
plugins_rc[count] = g_strdup(saved_plugins[i]);
count++;
@@ -240,9 +224,8 @@ parole_plugins_manager_save_rc(ParolePluginsManager *manager, gchar *filename, g
void
parole_plugins_manager_cell_toggled_cb(GtkCellRendererToggle *cell_renderer,
- gchar *path_str,
- PrefData *pref)
-{
+ gchar *path_str,
+ PrefData *pref) {
ParoleProviderModule *module = NULL;
GtkTreeIter iter;
GtkTreePath *path;
@@ -250,8 +233,7 @@ parole_plugins_manager_cell_toggled_cb(GtkCellRendererToggle *cell_renderer,
path = gtk_tree_path_new_from_string(path_str);
- if (gtk_tree_model_get_iter (GTK_TREE_MODEL (pref->store), &iter, path))
- {
+ if (gtk_tree_model_get_iter(GTK_TREE_MODEL(pref->store), &iter, path)) {
gtk_tree_model_get(GTK_TREE_MODEL(pref->store), &iter,
COL_ACTIVE, &active,
COL_MODULE, &module,
@@ -285,9 +267,7 @@ parole_plugins_manager_cell_toggled_cb(GtkCellRendererToggle *cell_renderer,
parole_plugins_manager_save_rc(pref->manager, G_TYPE_MODULE(module)->name, active);
}
-void parole_plugins_manager_tree_cursor_changed_cb(GtkTreeView *view,
- PrefData *pref)
-{
+void parole_plugins_manager_tree_cursor_changed_cb(GtkTreeView *view, PrefData *pref) {
ParoleProviderModule *module;
ParolePluginInfo *info;
gboolean configurable = FALSE;
@@ -307,8 +287,7 @@ void parole_plugins_manager_tree_cursor_changed_cb(GtkTreeView *view,
gtk_widget_set_tooltip_text(pref->site, site);
- if ( parole_provider_module_get_is_active (module) )
- {
+ if (parole_provider_module_get_is_active(module)) {
configurable = parole_provider_plugin_get_is_configurable(PAROLE_PROVIDER_PLUGIN(module));
}
@@ -316,13 +295,11 @@ void parole_plugins_manager_tree_cursor_changed_cb(GtkTreeView *view,
}
static void
-parole_plugins_manager_unload_all(gpointer data, gpointer user_data)
-{
+parole_plugins_manager_unload_all(gpointer data, gpointer user_data) {
ParoleProviderModule *module;
module = PAROLE_PROVIDER_MODULE(data);
- if ( parole_provider_module_get_is_active (module) )
- {
+ if (parole_provider_module_get_is_active(module)) {
parole_provider_module_free_plugin(module);
g_type_module_unuse(G_TYPE_MODULE(data));
}
@@ -330,8 +307,7 @@ parole_plugins_manager_unload_all(gpointer data, gpointer user_data)
}
static ParolePluginInfo *
-parole_plugins_manager_get_plugin_info(const gchar *desktop_file)
-{
+parole_plugins_manager_get_plugin_info(const gchar *desktop_file) {
ParolePluginInfo *info;
GKeyFile *file;
GError *error = NULL;
@@ -345,8 +321,7 @@ parole_plugins_manager_get_plugin_info(const gchar *desktop_file)
file = g_key_file_new();
- if ( !g_key_file_load_from_file (file, desktop_file , G_KEY_FILE_NONE, &error) )
- {
+ if (!g_key_file_load_from_file(file, desktop_file , G_KEY_FILE_NONE, &error)) {
g_warning("Error opening file : %s : %s", desktop_file, error->message);
g_error_free(error);
goto out;
@@ -380,8 +355,7 @@ out:
}
static void
-parole_plugins_manager_show_plugins_pref(GtkWidget *widget, ParolePluginsManager *manager)
-{
+parole_plugins_manager_show_plugins_pref(GtkWidget *widget, ParolePluginsManager *manager) {
GtkBuilder *builder;
GtkTreeSelection *sel;
GtkTreePath *path;
@@ -391,8 +365,7 @@ parole_plugins_manager_show_plugins_pref(GtkWidget *widget, ParolePluginsManager
PrefData *pref;
/*No plugins found*/
- if ( manager->priv->array->len == 0 )
- {
+ if ( manager->priv->array->len == 0 ) {
parole_dialog_info(GTK_WINDOW(manager->priv->main_window),
_("No installed plugins found on this system"),
_("Please check your installation."));
@@ -417,8 +390,7 @@ parole_plugins_manager_show_plugins_pref(GtkWidget *widget, ParolePluginsManager
gtk_window_set_transient_for(GTK_WINDOW(pref->window),
GTK_WINDOW(manager->priv->main_window));
- for ( i = 0; i < manager->priv->array->len; i++)
- {
+ for (i = 0; i < manager->priv->array->len; i++) {
ParoleProviderModule *module;
ParolePluginInfo *info;
module = g_ptr_array_index(manager->priv->array, i);
@@ -449,36 +421,31 @@ parole_plugins_manager_show_plugins_pref(GtkWidget *widget, ParolePluginsManager
}
static void
-parole_plugins_manager_set_show_tabs(GtkNotebook *nt)
-{
+parole_plugins_manager_set_show_tabs(GtkNotebook *nt) {
gint npages;
npages = gtk_notebook_get_n_pages(nt);
gtk_notebook_set_show_tabs(nt, npages > 1);
}
static void
-parole_plugins_manager_page_added_cb(GtkContainer *container, GtkWidget *widget, gpointer data)
-{
+parole_plugins_manager_page_added_cb(GtkContainer *container, GtkWidget *widget, gpointer data) {
parole_plugins_manager_set_show_tabs(GTK_NOTEBOOK(container));
}
static void
-parole_plugins_manager_page_removed_cb(GtkContainer *container, GtkWidget *widget, gpointer data)
-{
+parole_plugins_manager_page_removed_cb(GtkContainer *container, GtkWidget *widget, gpointer data) {
parole_plugins_manager_set_show_tabs(GTK_NOTEBOOK(container));
}
static void parole_plugins_manager_set_property(GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec) {
ParolePluginsManager *manager;
manager = PAROLE_PLUGINS_MANAGER(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_LOAD_PLUGIN:
manager->priv->load_plugins = g_value_get_boolean(value);
break;
@@ -489,16 +456,14 @@ static void parole_plugins_manager_set_property(GObject *object,
}
static void parole_plugins_manager_get_property(GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec) {
ParolePluginsManager *manager;
manager = PAROLE_PLUGINS_MANAGER(object);
- switch (prop_id)
- {
+ switch (prop_id) {
case PROP_LOAD_PLUGIN:
g_value_set_boolean(value, manager->priv->load_plugins);
break;
@@ -509,8 +474,7 @@ static void parole_plugins_manager_get_property(GObject *object,
}
static gchar *
-parole_plugins_manager_get_module_name(const gchar *desktop_file)
-{
+parole_plugins_manager_get_module_name(const gchar *desktop_file) {
GKeyFile *file;
GError *error = NULL;
gchar *module_name = NULL;
@@ -518,8 +482,7 @@ parole_plugins_manager_get_module_name(const gchar *desktop_file)
file = g_key_file_new();
- if ( !g_key_file_load_from_file (file, desktop_file, G_KEY_FILE_NONE, &error) )
- {
+ if (!g_key_file_load_from_file(file, desktop_file, G_KEY_FILE_NONE, &error)) {
g_warning("Error opening file : %s : %s", desktop_file, error->message);
g_error_free(error);
goto out;
@@ -536,8 +499,7 @@ out:
}
static void
-parole_plugins_manager_load_plugins(ParolePluginsManager *manager)
-{
+parole_plugins_manager_load_plugins(ParolePluginsManager *manager) {
gchar **plugins_rc;
guint len = 0, i, j;
@@ -546,16 +508,13 @@ parole_plugins_manager_load_plugins(ParolePluginsManager *manager)
if ( plugins_rc && plugins_rc[0] )
len = g_strv_length(plugins_rc);
- for ( j = 0; j < manager->priv->array->len; j++)
- {
+ for (j = 0; j < manager->priv->array->len; j++) {
GTypeModule *module;
module = g_ptr_array_index(manager->priv->array, j);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
if ( !g_strcmp0 (plugins_rc[i], module->name) ||
- !g_strcmp0(plugins_rc[i], PAROLE_PROVIDER_MODULE(module)->library_name) )
- {
+ !g_strcmp0(plugins_rc[i], PAROLE_PROVIDER_MODULE(module)->library_name) ) {
TRACE("Loading plugin :%s", module->name);
if ( !g_type_module_use(module) ) {
parole_plugins_manager_save_rc(manager, module->name, FALSE);
@@ -571,8 +530,7 @@ parole_plugins_manager_load_plugins(ParolePluginsManager *manager)
}
static void
-parole_plugins_manager_class_init(ParolePluginsManagerClass *klass)
-{
+parole_plugins_manager_class_init(ParolePluginsManagerClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_plugins_manager_finalize;
@@ -592,8 +550,7 @@ parole_plugins_manager_class_init(ParolePluginsManagerClass *klass)
}
static void
-parole_plugins_manager_init(ParolePluginsManager *manager)
-{
+parole_plugins_manager_init(ParolePluginsManager *manager) {
GtkBuilder *builder;
manager->priv = PAROLE_PLUGINS_MANAGER_GET_PRIVATE(manager);
@@ -624,8 +581,7 @@ parole_plugins_manager_init(ParolePluginsManager *manager)
}
static void
-parole_plugins_manager_finalize(GObject *object)
-{
+parole_plugins_manager_finalize(GObject *object) {
ParolePluginsManager *manager;
manager = PAROLE_PLUGINS_MANAGER(object);
@@ -638,8 +594,7 @@ parole_plugins_manager_finalize(GObject *object)
}
ParolePluginsManager *
-parole_plugins_manager_new(gboolean load_plugins)
-{
+parole_plugins_manager_new(gboolean load_plugins) {
if ( G_LIKELY(parole_plugins_manager_object != NULL) ) {
g_object_ref(parole_plugins_manager_object);
} else {
@@ -653,45 +608,39 @@ parole_plugins_manager_new(gboolean load_plugins)
}
ParolePluginsManager *
-parole_plugins_manager_get(void)
-{
+parole_plugins_manager_get(void) {
if ( G_UNLIKELY (parole_plugins_manager_object == NULL ) )
g_error("Plugins Manager is NULL");
return PAROLE_PLUGINS_MANAGER (parole_plugins_manager_object);
}
-void parole_plugins_manager_load(ParolePluginsManager *manager)
-{
+void parole_plugins_manager_load(ParolePluginsManager *manager) {
GDir *dir;
GError *error = NULL;
const gchar *name;
dir = g_dir_open(PAROLE_PLUGINS_DATA_DIR, 0, &error);
- if ( error )
- {
+ if ( error ) {
g_debug("No installed plugins found");
g_error_free(error);
return;
}
- while ( (name = g_dir_read_name (dir) ))
- {
+ while ((name = g_dir_read_name(dir))) {
gchar *library_name;
gchar *desktop_file;
desktop_file = g_build_filename(PAROLE_PLUGINS_DATA_DIR, name, NULL);
library_name = parole_plugins_manager_get_module_name(desktop_file);
- if ( library_name )
- {
+ if ( library_name ) {
ParoleProviderModule *module;
gchar *library_path;
library_path = g_build_filename(PAROLE_PLUGINS_DIR, library_name, NULL);
- if ( !g_file_test (library_path, G_FILE_TEST_EXISTS) )
- {
+ if (!g_file_test(library_path, G_FILE_TEST_EXISTS)) {
g_debug("Desktop file found '%s' but no plugin installed", library_path);
g_free(library_path);
continue;
@@ -712,10 +661,8 @@ void parole_plugins_manager_load(ParolePluginsManager *manager)
}
void
-parole_plugins_manager_pack(ParolePluginsManager *manager, GtkWidget *widget, const gchar *title, ParolePluginContainer container)
-{
- if ( container == PAROLE_PLUGIN_CONTAINER_PLAYLIST )
- {
+parole_plugins_manager_pack(ParolePluginsManager *manager, GtkWidget *widget, const gchar *title, ParolePluginContainer container) {
+ if ( container == PAROLE_PLUGIN_CONTAINER_PLAYLIST ) {
gtk_notebook_append_page(GTK_NOTEBOOK(manager->priv->list_nt), widget, gtk_label_new(title));
gtk_widget_show_all(widget);
}
diff --git a/src/parole-plugins-manager.h b/src/parole-plugins-manager.h
index 025ef46..6238459 100644
--- a/src/parole-plugins-manager.h
+++ b/src/parole-plugins-manager.h
@@ -34,14 +34,12 @@ G_BEGIN_DECLS
typedef struct ParolePluginsManagerPrivate ParolePluginsManagerPrivate;
-typedef struct
-{
+typedef struct {
GObject parent;
ParolePluginsManagerPrivate *priv;
} ParolePluginsManager;
-typedef struct
-{
+typedef struct {
GObjectClass parent_class;
} ParolePluginsManagerClass;
diff --git a/src/parole-shortcuts.c b/src/parole-shortcuts.c
index fe0430e..240b050 100644
--- a/src/parole-shortcuts.c
+++ b/src/parole-shortcuts.c
@@ -36,13 +36,11 @@
static void parole_shortcuts_finalize(GObject *object);
-struct ParoleShortcuts
-{
+struct ParoleShortcuts {
GObject parent;
};
-struct ParoleShortcutsClass
-{
+struct ParoleShortcutsClass {
GObjectClass parent_class;
};
@@ -57,26 +55,22 @@ parole_shortcuts_close_cb (GtkShortcutsWindow *window, ParoleShortcuts *self)
*/
static void
-parole_shortcuts_class_init(ParoleShortcutsClass *klass)
-{
+parole_shortcuts_class_init(ParoleShortcutsClass *klass) {
GObjectClass *object_class = G_OBJECT_CLASS(klass);
object_class->finalize = parole_shortcuts_finalize;
}
static void
-parole_shortcuts_init(ParoleShortcuts *self)
-{
+parole_shortcuts_init(ParoleShortcuts *self) {
}
static void
-parole_shortcuts_finalize(GObject *object)
-{
+parole_shortcuts_finalize(GObject *object) {
G_OBJECT_CLASS(parole_shortcuts_parent_class)->finalize(object);
}
-ParoleShortcuts *parole_shortcuts(GtkWidget *parent)
-{
+ParoleShortcuts *parole_shortcuts(GtkWidget *parent) {
ParoleShortcuts *self;
GtkWidget *window;
GtkBuilder *builder;
diff --git a/src/parole-subtitle-encoding.c b/src/parole-subtitle-encoding.c
index 37e2b72..d4e02cf 100644
--- a/src/parole-subtitle-encoding.c
+++ b/src/parole-subtitle-encoding.c
@@ -40,8 +40,7 @@
#include "parole-subtitle-encoding.h"
-typedef enum
-{
+typedef enum {
SUBTITLE_ENCODING_CURRENT_LOCALE,
SUBTITLE_ENCODING_ISO_8859_6,
@@ -151,8 +150,7 @@ typedef enum
} SubtitleEncodingIndex;
-typedef struct
-{
+typedef struct {
int index;
const char *charset;
const char *name;
@@ -341,8 +339,7 @@ static SubtitleEncoding encodings[] = {
};
static const SubtitleEncoding *
-find_encoding_by_charset(const char *charset)
-{
+find_encoding_by_charset(const char *charset) {
int i;
i = 1; /* skip current locale */
@@ -361,8 +358,7 @@ find_encoding_by_charset(const char *charset)
}
static void
-subtitle_encoding_init(void)
-{
+subtitle_encoding_init(void) {
guint i;
g_get_charset((const char **)
@@ -377,8 +373,7 @@ subtitle_encoding_init(void)
}
static int
-subtitle_encoding_get_index(const char *charset)
-{
+subtitle_encoding_get_index(const char *charset) {
const SubtitleEncoding *e;
e = find_encoding_by_charset(charset);
@@ -389,8 +384,7 @@ subtitle_encoding_get_index(const char *charset)
}
static const char *
-subtitle_encoding_get_charset(int index_i)
-{
+subtitle_encoding_get_charset(int index_i) {
const SubtitleEncoding *e;
if (index_i >= SUBTITLE_ENCODING_LAST)
@@ -402,15 +396,13 @@ subtitle_encoding_get_charset(int index_i)
return e->charset;
}
-enum
-{
+enum {
INDEX_COL,
NAME_COL
};
static gint
-compare(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer data)
-{
+compare(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer data) {
gchar *str_a, *str_b;
gint result;
@@ -427,9 +419,8 @@ compare(GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer data)
static void
is_encoding_sensitive(GtkCellLayout * cell_layout,
- GtkCellRenderer * cell,
- GtkTreeModel * tree_model, GtkTreeIter * iter, gpointer data)
-{
+ GtkCellRenderer * cell,
+ GtkTreeModel * tree_model, GtkTreeIter * iter, gpointer data) {
gboolean sensitive;
sensitive = !gtk_tree_model_iter_has_child(tree_model, iter);
@@ -437,8 +428,7 @@ is_encoding_sensitive(GtkCellLayout * cell_layout,
}
static GtkTreeModel *
-subtitle_encoding_create_store(void)
-{
+subtitle_encoding_create_store(void) {
gchar *label;
gchar *lastlang = "";
GtkTreeIter iter, iter2;
@@ -468,8 +458,7 @@ subtitle_encoding_create_store(void)
}
static void
-subtitle_encoding_combo_render(GtkComboBox * combo)
-{
+subtitle_encoding_combo_render(GtkComboBox * combo) {
GtkCellRenderer *renderer;
renderer = gtk_cell_renderer_text_new();
@@ -481,8 +470,7 @@ subtitle_encoding_combo_render(GtkComboBox * combo)
}
const char *
-parole_subtitle_encoding_get_selected(GtkComboBox * combo)
-{
+parole_subtitle_encoding_get_selected(GtkComboBox * combo) {
GtkTreeModel *model;
GtkTreeIter iter;
gint index_i = -1;
@@ -498,8 +486,7 @@ parole_subtitle_encoding_get_selected(GtkComboBox * combo)
}
void
-parole_subtitle_encoding_set(GtkComboBox * combo, const char *encoding)
-{
+parole_subtitle_encoding_set(GtkComboBox * combo, const char *encoding) {
GtkTreeModel *model;
GtkTreeIter iter, iter2;
gint index_i, i;
@@ -509,8 +496,7 @@ parole_subtitle_encoding_set(GtkComboBox * combo, const char *encoding)
model = gtk_combo_box_get_model(combo);
index_i = subtitle_encoding_get_index(encoding);
- if (gtk_tree_model_get_iter_first (model, &iter))
- {
+ if (gtk_tree_model_get_iter_first(model, &iter)) {
do {
if (!gtk_tree_model_iter_has_child (model, &iter))
continue;
@@ -529,8 +515,7 @@ parole_subtitle_encoding_set(GtkComboBox * combo, const char *encoding)
}
void
-parole_subtitle_encoding_init(GtkComboBox *combo)
-{
+parole_subtitle_encoding_init(GtkComboBox *combo) {
GtkTreeModel *model;
subtitle_encoding_init();
model = subtitle_encoding_create_store();
diff --git a/src/parole-utils.c b/src/parole-utils.c
index af51728..2b774c8 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -68,9 +68,7 @@ static const char subtitle_ext[][4] = {
*
*/
static gint
-compare_by_name_using_number(const gchar *ap,
- const gchar *bp)
-{
+compare_by_name_using_number(const gchar *ap, const gchar *bp) {
guint anum;
guint bnum;
@@ -99,9 +97,8 @@ compare_by_name_using_number(const gchar *ap,
*/
gint
thunar_file_compare_by_name(ParoleFile *file_a,
- ParoleFile *file_b,
- gboolean case_sensitive)
-{
+ ParoleFile *file_b,
+ gboolean case_sensitive) {
const gchar *ap;
const gchar *bp;
guint ac;
@@ -115,8 +112,7 @@ thunar_file_compare_by_name(ParoleFile *file_a,
/* check if we should ignore case */
if (G_LIKELY(case_sensitive)) {
/* try simple (fast) ASCII comparison first */
- for (;; ++ap, ++bp)
- {
+ for (;; ++ap, ++bp) {
/* check if the characters differ or we have a non-ASCII char */
ac = *((const guchar *) ap);
bc = *((const guchar *) bp);
@@ -126,19 +122,17 @@ thunar_file_compare_by_name(ParoleFile *file_a,
/* fallback to Unicode comparison */
if (G_UNLIKELY(ac > 127 || bc > 127)) {
- for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
- {
- /* check if characters differ or end of string */
- ac = g_utf8_get_char(ap);
- bc = g_utf8_get_char(bp);
- if (ac != bc || ac == 0)
- break;
+ for (;; ap = g_utf8_next_char(ap), bp = g_utf8_next_char(bp)) {
+ /* check if characters differ or end of string */
+ ac = g_utf8_get_char(ap);
+ bc = g_utf8_get_char(bp);
+ if (ac != bc || ac == 0)
+ break;
}
}
} else {
/* try simple (fast) ASCII comparison first (case-insensitive!) */
- for (;; ++ap, ++bp)
- {
+ for (;; ++ap, ++bp) {
/* check if the characters differ or we have a non-ASCII char */
ac = *((const guchar *) ap);
bc = *((const guchar *) bp);
@@ -148,8 +142,7 @@ thunar_file_compare_by_name(ParoleFile *file_a,
/* fallback to Unicode comparison (case-insensitive!) */
if (G_UNLIKELY(ac > 127 || bc > 127)) {
- for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
- {
+ for (;; ap = g_utf8_next_char(ap), bp = g_utf8_next_char(bp)) {
/* check if characters differ or end of string */
ac = g_utf8_get_char(ap);
bc = g_utf8_get_char(bp);
@@ -160,12 +153,11 @@ thunar_file_compare_by_name(ParoleFile *file_a,
}
/* if both strings are equal, we're done */
- if (G_UNLIKELY (ac == bc || (!case_sensitive && g_unichar_tolower (ac) == g_unichar_tolower (bc))))
+ if (G_UNLIKELY(ac == bc || (!case_sensitive && g_unichar_tolower (ac) == g_unichar_tolower (bc))))
return 0;
/* check if one of the characters that differ is a digit */
- if (G_UNLIKELY (g_ascii_isdigit (ac) || g_ascii_isdigit (bc)))
- {
+ if (G_UNLIKELY(g_ascii_isdigit(ac) || g_ascii_isdigit(bc))) {
/* if both strings differ in a digit, we use a smarter comparison
* to get sorting 'file1', 'file5', 'file10' done the right way.
*/
@@ -176,8 +168,7 @@ thunar_file_compare_by_name(ParoleFile *file_a,
* makes sense, if the previous char for both strings is a digit.
*/
if (ap > parole_file_get_display_name (file_a) && bp > parole_file_get_display_name (file_b)
- && g_ascii_isdigit(*(ap - 1)) && g_ascii_isdigit(*(bp - 1)))
- {
+ && g_ascii_isdigit(*(ap - 1)) && g_ascii_isdigit(*(bp - 1))) {
return compare_by_name_using_number (ap - 1, bp - 1);
}
}
@@ -223,15 +214,13 @@ thunar_file_compare_by_name(ParoleFile *file_a,
}
gchar *
-parole_get_name_without_extension(const gchar *name)
-{
+parole_get_name_without_extension(const gchar *name) {
guint len, suffix;
gchar *ret;
len = strlen(name);
- for ( suffix = len -1; suffix > 0; suffix--)
- {
+ for (suffix = len -1; suffix > 0; suffix--) {
if ( name[suffix] == '.' )
break;
}
@@ -241,16 +230,14 @@ parole_get_name_without_extension(const gchar *name)
}
static gchar *
-parole_get_subtitle_in_dir(const gchar *dir_path, const gchar *file)
-{
+parole_get_subtitle_in_dir(const gchar *dir_path, const gchar *file) {
gchar *sub_path = NULL;
gchar *file_no_ext;
guint i;
file_no_ext = parole_get_name_without_extension(file);
- for ( i = 0; i < G_N_ELEMENTS (subtitle_ext); i++)
- {
+ for (i = 0; i < G_N_ELEMENTS(subtitle_ext); i++) {
sub_path = g_strdup_printf("%s%c%s.%s", dir_path, G_DIR_SEPARATOR, file_no_ext, subtitle_ext[i]);
if ( g_file_test (sub_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) )
@@ -265,8 +252,7 @@ parole_get_subtitle_in_dir(const gchar *dir_path, const gchar *file)
return sub_path;
}
-gchar *parole_get_subtitle_path(const gchar *uri)
-{
+gchar *parole_get_subtitle_path(const gchar *uri) {
GFile *file, *parent;
GFileInfo *info;
GError *error = NULL;
@@ -279,8 +265,7 @@ gchar *parole_get_subtitle_path(const gchar *uri)
TRACE("uri : %s", uri);
- if ( !parent )
- {
+ if ( !parent ) {
g_object_unref(file);
return NULL;
}
@@ -291,8 +276,7 @@ gchar *parole_get_subtitle_path(const gchar *uri)
NULL,
&error);
- if ( error )
- {
+ if ( error ) {
g_warning("%s: \n", error->message);
g_error_free(error);
return NULL;
@@ -315,8 +299,7 @@ gchar *parole_get_subtitle_path(const gchar *uri)
}
gboolean
-parole_is_uri_disc(const gchar *uri)
-{
+parole_is_uri_disc(const gchar *uri) {
if ( g_str_has_prefix (uri, "dvd:/") || g_str_has_prefix (uri, "vcd:/")
|| g_str_has_prefix(uri, "svcd:/") || g_str_has_prefix(uri, "cdda:/"))
return TRUE;
@@ -324,8 +307,7 @@ parole_is_uri_disc(const gchar *uri)
return FALSE;
}
-GdkPixbuf *parole_icon_load(const gchar *icon_name, gint size)
-{
+GdkPixbuf *parole_icon_load(const gchar *icon_name, gint size) {
GdkPixbuf *pix = NULL;
GError *error = NULL;
@@ -335,8 +317,7 @@ GdkPixbuf *parole_icon_load(const gchar *icon_name, gint size)
GTK_ICON_LOOKUP_USE_BUILTIN,
&error);
- if ( error )
- {
+ if ( error ) {
g_warning("Unable to load icon : %s : %s", icon_name, error->message);
g_error_free(error);
}
@@ -344,9 +325,7 @@ GdkPixbuf *parole_icon_load(const gchar *icon_name, gint size)
return pix;
}
-void parole_get_media_files(GtkFileFilter *filter, const gchar *path,
- gboolean recursive, GSList **list)
-{
+void parole_get_media_files(GtkFileFilter *filter, const gchar *path, gboolean recursive, GSList **list) {
GtkFileFilter *playlist_filter;
GSList *list_internal = NULL;
GSList *playlist = NULL;
@@ -363,8 +342,7 @@ void parole_get_media_files(GtkFileFilter *filter, const gchar *path,
if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
file = parole_file_new(path);
if ( parole_file_filter (playlist_filter, file) &&
- parole_pl_parser_guess_format_from_extension(path) != PAROLE_PL_FORMAT_UNKNOWN )
- {
+ parole_pl_parser_guess_format_from_extension(path) != PAROLE_PL_FORMAT_UNKNOWN ) {
playlist = parole_pl_parser_parse_from_file_by_extension(path);
g_object_unref(file);
if (playlist) {
@@ -381,16 +359,14 @@ void parole_get_media_files(GtkFileFilter *filter, const gchar *path,
if ( G_UNLIKELY (dir == NULL) )
return;
- while ((name = g_dir_read_name (dir)))
- {
+ while ((name = g_dir_read_name(dir))) {
gchar *path_internal = g_build_filename(path, name, NULL);
if (g_file_test(path_internal, G_FILE_TEST_IS_DIR) && recursive) {
parole_get_media_files(filter, path_internal, TRUE, list);
} else if ( g_file_test(path_internal, G_FILE_TEST_IS_REGULAR) ) {
file = parole_file_new(path_internal);
if (parole_file_filter (playlist_filter, file) &&
- parole_pl_parser_guess_format_from_extension(path) != PAROLE_PL_FORMAT_UNKNOWN)
- {
+ parole_pl_parser_guess_format_from_extension(path) != PAROLE_PL_FORMAT_UNKNOWN) {
playlist = parole_pl_parser_parse_from_file_by_extension(path_internal);
g_object_unref(file);
if (playlist) {
@@ -418,8 +394,7 @@ void parole_get_media_files(GtkFileFilter *filter, const gchar *path,
gboolean
-parole_device_has_cdda(const gchar *device)
-{
+parole_device_has_cdda(const gchar *device) {
gboolean ret_val = FALSE;
#if defined(__linux__)
@@ -451,8 +426,7 @@ parole_device_has_cdda(const gchar *device)
}
gchar *
-parole_guess_uri_from_mount(GMount *mount)
-{
+parole_guess_uri_from_mount(GMount *mount) {
GFile *file;
gchar *uri = NULL;
@@ -468,8 +442,7 @@ parole_guess_uri_from_mount(GMount *mount)
content_type = g_content_type_guess_for_tree(file);
- for ( i = 0; content_type && content_type[i]; i++)
- {
+ for (i = 0; content_type && content_type[i]; i++) {
TRACE("Checking disc content type : %s", content_type[i]);
if ( !g_strcmp0(content_type[i], "x-content/video-dvd") ) {
@@ -499,8 +472,7 @@ parole_guess_uri_from_mount(GMount *mount)
}
gchar *
-parole_get_uri_from_unix_device(const gchar *device)
-{
+parole_get_uri_from_unix_device(const gchar *device) {
GVolumeMonitor *monitor;
GList *list;
guint len;
@@ -511,8 +483,7 @@ parole_get_uri_from_unix_device(const gchar *device)
return NULL;
/*Check for cdda */
- if ( parole_device_has_cdda (device) )
- {
+ if (parole_device_has_cdda(device)) {
return g_strdup ("cdda://");
}
@@ -522,8 +493,7 @@ parole_get_uri_from_unix_device(const gchar *device)
len = g_list_length(list);
- for ( i = 0; i < len; i++)
- {
+ for (i = 0; i < len; i++) {
GVolume *volume;
GDrive *drive;
@@ -531,18 +501,15 @@ parole_get_uri_from_unix_device(const gchar *device)
drive = g_volume_get_drive(volume);
- if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
- {
+ if (g_drive_can_eject(drive) && g_drive_has_media(drive)) {
gchar *unix_device;
unix_device = g_volume_get_identifier(volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
- if ( !g_strcmp0 (unix_device, device) )
- {
+ if (!g_strcmp0(unix_device, device)) {
GMount *mount;
mount = g_volume_get_mount(volume);
- if ( mount )
- {
+ if ( mount ) {
uri = parole_guess_uri_from_mount(mount);
g_object_unref(mount);
g_object_unref(drive);
@@ -573,8 +540,7 @@ parole_get_uri_from_unix_device(const gchar *device)
*
* Returns : formated string for the media lenght
**/
-gchar *parole_format_media_length(gint total_seconds)
-{
+gchar *parole_format_media_length(gint total_seconds) {
gchar *timestring;
gint hours;
@@ -604,18 +570,15 @@ gchar *parole_format_media_length(gint total_seconds)
* Returns: the length of the media only if the file is a local
* media file.
**/
-gchar *parole_taglibc_get_media_length(ParoleFile *file)
-{
+gchar *parole_taglibc_get_media_length(ParoleFile *file) {
#ifdef HAVE_TAGLIBC
TagLib_File *tag_file;
- if (g_str_has_prefix (parole_file_get_uri (file), "file:/"))
- {
+ if (g_str_has_prefix(parole_file_get_uri(file), "file:/")) {
tag_file = taglib_file_new(parole_file_get_file_name(file));
- if ( tag_file )
- {
+ if ( tag_file ) {
gint length = 0;
const TagLib_AudioProperties *prop = taglib_file_audioproperties(tag_file);
@@ -633,9 +596,7 @@ gchar *parole_taglibc_get_media_length(ParoleFile *file)
return NULL;
}
-GSimpleAction* g_simple_toggle_action_new(const gchar *action_name,
- const GVariantType *parameter_type)
-{
+GSimpleAction* g_simple_toggle_action_new(const gchar *action_name, const GVariantType *parameter_type) {
GSimpleAction *simple;
simple = g_simple_action_new_stateful(action_name, parameter_type,
@@ -644,21 +605,18 @@ GSimpleAction* g_simple_toggle_action_new(const gchar *action_name,
return simple;
}
-gboolean g_simple_toggle_action_get_active(GSimpleAction *simple)
-{
+gboolean g_simple_toggle_action_get_active(GSimpleAction *simple) {
GVariant *state;
g_object_get(simple,
- "state", &state,
- NULL);
+ "state", &state,
+ NULL);
return g_variant_get_boolean(state);
}
-void g_simple_toggle_action_set_active(GSimpleAction *simple, gboolean active)
-{
- if (g_simple_toggle_action_get_active(simple) != active)
- {
+void g_simple_toggle_action_set_active(GSimpleAction *simple, gboolean active) {
+ if (g_simple_toggle_action_get_active(simple) != active) {
g_simple_action_set_state(simple, g_variant_new_boolean(active));
}
}
diff --git a/src/parole-vis.c b/src/parole-vis.c
index 1fe9e30..4be084c 100644
--- a/src/parole-vis.c
+++ b/src/parole-vis.c
@@ -34,8 +34,7 @@
#include "parole-vis.h"
static gboolean
-parole_vis_filter(GstPluginFeature *feature, gpointer data)
-{
+parole_vis_filter(GstPluginFeature *feature, gpointer data) {
GstElementFactory *factory;
if ( !GST_IS_ELEMENT_FACTORY (feature) )
@@ -50,13 +49,11 @@ parole_vis_filter(GstPluginFeature *feature, gpointer data)
}
static void
-parole_vis_get_name(GstElementFactory *factory, GHashTable **hash)
-{
+parole_vis_get_name(GstElementFactory *factory, GHashTable **hash) {
g_hash_table_insert(*hash, g_strdup(gst_element_factory_get_longname(factory)), factory);
}
-GHashTable *parole_vis_get_plugins(void)
-{
+GHashTable *parole_vis_get_plugins(void) {
GList *plugins = NULL;
GHashTable *hash;
diff --git a/src/plugins/mpris2/mpris2-plugin.c b/src/plugins/mpris2/mpris2-plugin.c
index 943592d..3ff8d16 100644
--- a/src/plugins/mpris2/mpris2-plugin.c
+++ b/src/plugins/mpris2/mpris2-plugin.c
@@ -33,14 +33,12 @@ G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize(ParoleProviderPlugin *plugin)
-{
+parole_plugin_initialize(ParoleProviderPlugin *plugin) {
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
mpris2_provider_register_type(plugin);
return MPRIS2_TYPE_PROVIDER;
}
G_MODULE_EXPORT void
-parole_plugin_shutdown(void)
-{
+parole_plugin_shutdown(void) {
}
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index cde4462..d5ad438 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -34,13 +34,11 @@ static void mpris2_provider_finalize(GObject *object);
#define MPRIS_NAME "org.mpris.MediaPlayer2.parole"
#define MPRIS_PATH "/org/mpris/MediaPlayer2"
-struct _Mpris2ProviderClass
-{
+struct _Mpris2ProviderClass {
GObjectClass parent_class;
};
-struct _Mpris2Provider
-{
+struct _Mpris2Provider {
GObject parent;
ParoleProviderPlayer *player;
ParoleConf *conf;
@@ -134,49 +132,40 @@ static const gchar mpris2xml[] =
/*
* org.mpris.MediaPlayer2
*/
-static void mpris_Root_Raise(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Root_Raise(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
GtkWidget *widget = parole_provider_player_get_main_window(provider->player);
- if (widget)
- {
+ if (widget) {
GdkWindow *window = gtk_widget_get_window(widget);
- if (window)
- {
+ if (window) {
gdk_window_raise(window);
}
}
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Root_Quit(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Root_Quit(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
/* TODO: optionally get a real close API since this won't work always */
gtk_main_quit();
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static GVariant* mpris_Root_get_CanQuit(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_CanQuit(GError **error, Mpris2Provider *provider) {
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_CanRaise(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_CanRaise(GError **error, Mpris2Provider *provider) {
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_Fullscreen(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_Fullscreen(GError **error, Mpris2Provider *provider) {
return g_variant_new_boolean(provider->saved_fullscreen);
}
-static void mpris_Root_put_Fullscreen(GVariant *value, GError **error, Mpris2Provider *provider)
-{
+static void mpris_Root_put_Fullscreen(GVariant *value, GError **error, Mpris2Provider *provider) {
gboolean fullscreen = g_variant_get_boolean(value);
GtkWidget *window = parole_provider_player_get_main_window(provider->player);
- if (window)
- {
+ if (window) {
if (fullscreen)
gtk_window_fullscreen(GTK_WINDOW(window));
else
@@ -184,35 +173,29 @@ static void mpris_Root_put_Fullscreen(GVariant *value, GError **error, Mpris2Pro
}
}
-static GVariant* mpris_Root_get_CanSetFullscreen(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_CanSetFullscreen(GError **error, Mpris2Provider *provider) {
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_HasTrackList(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_HasTrackList(GError **error, Mpris2Provider *provider) {
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Root_get_Identity(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_Identity(GError **error, Mpris2Provider *provider) {
return g_variant_new_string(_("Parole Media Player"));
}
-static GVariant* mpris_Root_get_DesktopEntry(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_DesktopEntry(GError **error, Mpris2Provider *provider) {
return g_variant_new_string("parole");
}
-static GVariant* mpris_Root_get_SupportedUriSchemes(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_SupportedUriSchemes(GError **error, Mpris2Provider *provider) {
return g_variant_parse(G_VARIANT_TYPE("as"),
"['cdda', 'dvd', 'file', 'icy', 'icyx', 'mms', 'mmsh', 'net', "
"'pnm', 'rtmp', 'rtp', 'rtsp', 'uvox']", NULL, NULL, NULL);
}
-static GVariant* mpris_Root_get_SupportedMimeTypes(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Root_get_SupportedMimeTypes(GError **error, Mpris2Provider *provider) {
return g_variant_parse(G_VARIANT_TYPE("as"),
"['application/mxf', 'application/ogg', 'application/ram', "
"'application/sdp', 'application/vnd.apple.mpegurl', "
@@ -252,13 +235,11 @@ static GVariant* mpris_Root_get_SupportedMimeTypes(GError **error, Mpris2Provide
/*
* org.mpris.MediaPlayer2.Player
*/
-static void mpris_Player_Play(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_Play(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
ParoleProviderPlayer *player = provider->player;
ParoleState state = parole_provider_player_get_state(player);
- switch (state)
- {
+ switch (state) {
case PAROLE_STATE_PAUSED:
parole_provider_player_resume(provider->player);
break;
@@ -277,34 +258,29 @@ static void mpris_Player_Play(GDBusMethodInvocation *invocation, GVariant* param
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Next(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_Next(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
parole_provider_player_play_next(provider->player);
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Previous(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_Previous(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
parole_provider_player_play_previous(provider->player);
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Pause(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_Pause(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
parole_provider_player_pause(provider->player);
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_PlayPause(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_PlayPause(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
ParoleProviderPlayer *player = provider->player;
ParoleState state = parole_provider_player_get_state(player);
- switch (state)
- {
+ switch (state) {
case PAROLE_STATE_PAUSED:
parole_provider_player_resume(player);
break;
@@ -323,15 +299,13 @@ static void mpris_Player_PlayPause(GDBusMethodInvocation *invocation, GVariant*
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Stop(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_Stop(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
parole_provider_player_stop(provider->player);
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_Seek(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_Seek(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
ParoleProviderPlayer *player = provider->player;
const ParoleStream *stream = parole_provider_player_get_stream(player);
gint64 param;
@@ -359,8 +333,7 @@ static void mpris_Player_Seek(GDBusMethodInvocation *invocation, GVariant* param
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_SetPosition(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_SetPosition(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
ParoleProviderPlayer *player = provider->player;
const ParoleStream *stream = parole_provider_player_get_stream(player);
gchar *track_id = NULL;
@@ -389,8 +362,7 @@ static void mpris_Player_SetPosition(GDBusMethodInvocation *invocation, GVariant
g_dbus_method_invocation_return_value(invocation, NULL);
}
-static void mpris_Player_OpenUri(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider)
-{
+static void mpris_Player_OpenUri(GDBusMethodInvocation *invocation, GVariant* parameters, Mpris2Provider *provider) {
gchar *uri = NULL;
gboolean happened = FALSE;
ParoleProviderPlayer *player = provider->player;
@@ -410,12 +382,10 @@ static void mpris_Player_OpenUri(GDBusMethodInvocation *invocation, GVariant* pa
"This file does not play here.");
}
-static GVariant* mpris_Player_get_PlaybackStatus(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_PlaybackStatus(GError **error, Mpris2Provider *provider) {
ParoleProviderPlayer *player = provider->player;
- switch (parole_provider_player_get_state(player))
- {
+ switch (parole_provider_player_get_state(player)) {
case PAROLE_STATE_ABOUT_TO_FINISH:
case PAROLE_STATE_PLAYING:
return g_variant_new_string("Playing");
@@ -426,16 +396,14 @@ static GVariant* mpris_Player_get_PlaybackStatus(GError **error, Mpris2Provider
}
}
-static GVariant* mpris_Player_get_LoopStatus(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_LoopStatus(GError **error, Mpris2Provider *provider) {
gboolean repeat = FALSE;
g_object_get(G_OBJECT(provider->conf), "repeat", &repeat, NULL);
return g_variant_new_string(repeat ? "Playlist" : "None");
}
-static void mpris_Player_put_LoopStatus(GVariant *value, GError **error, Mpris2Provider *provider)
-{
+static void mpris_Player_put_LoopStatus(GVariant *value, GError **error, Mpris2Provider *provider) {
const gchar *new_loop = g_variant_get_string(value, NULL);
gboolean repeat = g_strcmp0("Playlist", new_loop) ? FALSE : TRUE;
@@ -443,18 +411,15 @@ static void mpris_Player_put_LoopStatus(GVariant *value, GError **error, Mpris2P
g_object_set(G_OBJECT(provider->conf), "repeat", repeat, NULL);
}
-static GVariant* mpris_Player_get_Rate(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_Rate(GError **error, Mpris2Provider *provider) {
return g_variant_new_double(1.0);
}
-static void mpris_Player_put_Rate(GVariant *value, GError **error, Mpris2Provider *provider)
-{
+static void mpris_Player_put_Rate(GVariant *value, GError **error, Mpris2Provider *provider) {
g_set_error(error, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "This is not alsaplayer.");
}
-static GVariant* mpris_Player_get_Shuffle(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_Shuffle(GError **error, Mpris2Provider *provider) {
gboolean shuffle = FALSE;
g_object_get(G_OBJECT(provider->conf), "shuffle", &shuffle, NULL);
@@ -462,15 +427,13 @@ static GVariant* mpris_Player_get_Shuffle(GError **error, Mpris2Provider *provid
return g_variant_new_boolean(shuffle);
}
-static void mpris_Player_put_Shuffle(GVariant *value, GError **error, Mpris2Provider *provider)
-{
+static void mpris_Player_put_Shuffle(GVariant *value, GError **error, Mpris2Provider *provider) {
gboolean shuffle = g_variant_get_boolean(value);
g_object_set(G_OBJECT(provider->conf), "shuffle", shuffle, NULL);
}
-static GVariant * handle_get_trackid(const ParoleStream *stream)
-{
+static GVariant * handle_get_trackid(const ParoleStream *stream) {
// TODO: Returning a path requires TrackList interface implementation
gchar *o = alloca(260);
if (NULL == stream)
@@ -481,8 +444,7 @@ static GVariant * handle_get_trackid(const ParoleStream *stream)
return g_variant_new_object_path(o);
}
-static void g_variant_builder_add_array(GVariantBuilder *b, const gchar *tag, const gchar *val)
-{
+static void g_variant_builder_add_array(GVariantBuilder *b, const gchar *tag, const gchar *val) {
GVariant *vval = NULL, *vvals = NULL;
if (!val)
@@ -494,8 +456,7 @@ static void g_variant_builder_add_array(GVariantBuilder *b, const gchar *tag, co
g_variant_builder_add(b, "{sv}", tag, vvals);
}
-static void g_variant_builder_add_string(GVariantBuilder *b, const gchar *tag, const gchar *val)
-{
+static void g_variant_builder_add_string(GVariantBuilder *b, const gchar *tag, const gchar *val) {
if (!val)
return;
@@ -503,30 +464,28 @@ static void g_variant_builder_add_string(GVariantBuilder *b, const gchar *tag, c
g_variant_new_string(val));
}
-static void handle_get_metadata(const ParoleStream *stream, GVariantBuilder *b)
-{
+static void handle_get_metadata(const ParoleStream *stream, GVariantBuilder *b) {
gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre, *image_uri;
gint track_id, bitrate;
gint64 duration;
gboolean has_video;
g_object_get(G_OBJECT(stream),
- "title", &title,
- "album", &album,
- "artist", &artist,
- "year", &year,
- "comment", &comment,
- "duration", &duration,
- "uri", &stream_uri,
- "genre", &genre,
- "image_uri", &image_uri,
- "track", &track_id,
- "bitrate", &bitrate,
- "has-video", &has_video,
- NULL);
-
- if (has_video)
- {
+ "title", &title,
+ "album", &album,
+ "artist", &artist,
+ "year", &year,
+ "comment", &comment,
+ "duration", &duration,
+ "uri", &stream_uri,
+ "genre", &genre,
+ "image_uri", &image_uri,
+ "track", &track_id,
+ "bitrate", &bitrate,
+ "has-video", &has_video,
+ NULL);
+
+ if (has_video) {
g_free(image_uri);
image_uri = NULL;
}
@@ -561,8 +520,7 @@ static void handle_get_metadata(const ParoleStream *stream, GVariantBuilder *b)
g_free(image_uri);
}
-static GVariant* mpris_Player_get_Metadata(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_Metadata(GError **error, Mpris2Provider *provider) {
GVariantBuilder b;
const ParoleStream *stream;
ParoleProviderPlayer *player = provider->player;
@@ -580,8 +538,7 @@ static GVariant* mpris_Player_get_Metadata(GError **error, Mpris2Provider *provi
return g_variant_builder_end(&b);
}
-static gdouble handle_get_volume(Mpris2Provider *provider)
-{
+static gdouble handle_get_volume(Mpris2Provider *provider) {
gint volume_int = 0;
gdouble volume_double;
@@ -591,13 +548,11 @@ static gdouble handle_get_volume(Mpris2Provider *provider)
return volume_double;
}
-static GVariant* mpris_Player_get_Volume(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_Volume(GError **error, Mpris2Provider *provider) {
return g_variant_new_double(handle_get_volume(provider));
}
-static void mpris_Player_put_Volume(GVariant *value, GError **error, Mpris2Provider *provider)
-{
+static void mpris_Player_put_Volume(GVariant *value, GError **error, Mpris2Provider *provider) {
gdouble volume = g_variant_get_double(value);
if (volume < 0.0)
@@ -608,8 +563,7 @@ static void mpris_Player_put_Volume(GVariant *value, GError **error, Mpris2Provi
g_object_set(G_OBJECT(provider->conf), "volume", (gint) (volume * 100.0), NULL);
}
-static GVariant* mpris_Player_get_Position(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_Position(GError **error, Mpris2Provider *provider) {
ParoleProviderPlayer *player = provider->player;
gint64 position = 0;
@@ -618,46 +572,39 @@ static GVariant* mpris_Player_get_Position(GError **error, Mpris2Provider *provi
return g_variant_new_int64(position);
}
-static GVariant* mpris_Player_get_MinimumRate(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_MinimumRate(GError **error, Mpris2Provider *provider) {
return g_variant_new_double(1.0);
}
-static GVariant* mpris_Player_get_MaximumRate(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_MaximumRate(GError **error, Mpris2Provider *provider) {
return g_variant_new_double(1.0);
}
-static GVariant* mpris_Player_get_CanGoNext(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_CanGoNext(GError **error, Mpris2Provider *provider) {
// do we need to go into such detail?
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Player_get_CanGoPrevious(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_CanGoPrevious(GError **error, Mpris2Provider *provider) {
// do we need to go into such detail?
return g_variant_new_boolean(TRUE);
}
-static GVariant* mpris_Player_get_CanPlay(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_CanPlay(GError **error, Mpris2Provider *provider) {
/* The CanPlay property should be true when the player is playing or paused. */
ParoleProviderPlayer *player = provider->player;
gint state = parole_provider_player_get_state(player);
return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state == PAROLE_STATE_PLAYING);
}
-static GVariant* mpris_Player_get_CanPause(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_CanPause(GError **error, Mpris2Provider *provider) {
/* The CanPause property should be true when the player is playing or paused. */
ParoleProviderPlayer *player = provider->player;
gint state = parole_provider_player_get_state(player);
return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state == PAROLE_STATE_PLAYING);
}
-static GVariant* mpris_Player_get_CanSeek(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_CanSeek(GError **error, Mpris2Provider *provider) {
gboolean seekable = FALSE;
ParoleProviderPlayer *player = provider->player;
@@ -671,8 +618,7 @@ static GVariant* mpris_Player_get_CanSeek(GError **error, Mpris2Provider *provid
return g_variant_new_boolean (seekable);
}
-static GVariant* mpris_Player_get_CanControl(GError **error, Mpris2Provider *provider)
-{
+static GVariant* mpris_Player_get_CanControl(GError **error, Mpris2Provider *provider) {
return g_variant_new_boolean(TRUE);
}
@@ -680,8 +626,7 @@ static GVariant* mpris_Player_get_CanControl(GError **error, Mpris2Provider *pro
* Update state.
*/
-static void parole_mpris_update_any(Mpris2Provider *provider)
-{
+static void parole_mpris_update_any(Mpris2Provider *provider) {
const ParoleStream *stream;
gboolean change_detected = FALSE, shuffle = FALSE, repeat = FALSE;
gchar *stream_uri = NULL;
@@ -763,14 +708,12 @@ static void parole_mpris_update_any(Mpris2Provider *provider)
static void
-state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, Mpris2Provider *provider)
-{
+state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, Mpris2Provider *provider) {
parole_mpris_update_any(provider);
}
static void
-seeked_cb(ParoleProviderPlayer *player, Mpris2Provider *provider)
-{
+seeked_cb(ParoleProviderPlayer *player, Mpris2Provider *provider) {
gint64 position = 0;
if (NULL == provider->dbus_connection)
@@ -784,8 +727,7 @@ seeked_cb(ParoleProviderPlayer *player, Mpris2Provider *provider)
}
static void
-conf_changed_cb(ParoleConf *conf, GParamSpec *pspec, Mpris2Provider *provider)
-{
+conf_changed_cb(ParoleConf *conf, GParamSpec *pspec, Mpris2Provider *provider) {
parole_mpris_update_any(provider);
}
@@ -795,14 +737,13 @@ conf_changed_cb(ParoleConf *conf, GParamSpec *pspec, Mpris2Provider *provider)
*/
static void
handle_method_call(GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *method_name,
- GVariant *parameters,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
-{
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *method_name,
+ GVariant *parameters,
+ GDBusMethodInvocation *invocation,
+ gpointer user_data) {
Mpris2Provider *provider;
ParoleProviderPlugin *plugin = user_data;
provider = MPRIS2_PROVIDER(plugin);
@@ -828,13 +769,12 @@ handle_method_call(GDBusConnection *connection,
static GVariant *
handle_get_property(GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *property_name,
- GError **error,
- gpointer user_data)
-{
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GError **error,
+ gpointer user_data) {
Mpris2Provider *provider;
ParoleProviderPlugin *plugin = user_data;
provider = MPRIS2_PROVIDER(plugin);
@@ -875,14 +815,13 @@ handle_get_property(GDBusConnection *connection,
static gboolean
handle_set_property(GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *property_name,
- GVariant *value,
- GError **error,
- void *user_data)
-{
+ const gchar *sender,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *property_name,
+ GVariant *value,
+ GError **error,
+ void *user_data) {
ParoleProviderPlugin *plugin = user_data;
Mpris2Provider *provider = MPRIS2_PROVIDER(plugin);
@@ -902,18 +841,14 @@ handle_set_property(GDBusConnection *connection,
}
static const
-GDBusInterfaceVTable interface_vtable =
-{
+GDBusInterfaceVTable interface_vtable = {
handle_method_call,
handle_get_property,
handle_set_property
};
static void
-on_bus_acquired(GDBusConnection *connection,
- const gchar *name,
- gpointer user_data)
-{
+on_bus_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data) {
Mpris2Provider *provider;
guint registration_id;
@@ -949,18 +884,13 @@ on_bus_acquired(GDBusConnection *connection,
static void
on_name_acquired(GDBusConnection *connection,
- const gchar *name,
- gpointer user_data)
-{
+ const gchar *name,
+ gpointer user_data) {
g_debug("MPRIS: Acquired DBus name %s", name);
}
static void
-on_name_lost(GDBusConnection *connection,
- const gchar *name,
- gpointer user_data)
-
-{
+on_name_lost(GDBusConnection *connection, const gchar *name, gpointer user_data) {
Mpris2Provider *provider;
ParoleProviderPlugin *plugin = user_data;
provider = MPRIS2_PROVIDER(plugin);
@@ -975,9 +905,8 @@ on_name_lost(GDBusConnection *connection,
static gboolean
on_window_state_event(GtkWidget *widget,
- GdkEventWindowState *event,
- Mpris2Provider *provider)
-{
+ GdkEventWindowState *event,
+ Mpris2Provider *provider) {
parole_mpris_update_any(provider);
return FALSE;
}
@@ -986,14 +915,12 @@ on_window_state_event(GtkWidget *widget,
* Plugin interface.
*/
-static gboolean mpris2_provider_is_configurable(ParoleProviderPlugin *plugin)
-{
+static gboolean mpris2_provider_is_configurable(ParoleProviderPlugin *plugin) {
return FALSE;
}
static void
-mpris2_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
-{
+mpris2_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player) {
Mpris2Provider *provider;
GtkWidget *window;
provider = MPRIS2_PROVIDER(plugin);
@@ -1038,27 +965,23 @@ mpris2_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *p
}
static void
-mpris2_provider_iface_init(ParoleProviderPluginIface *iface)
-{
+mpris2_provider_iface_init(ParoleProviderPluginIface *iface) {
iface->get_is_configurable = mpris2_provider_is_configurable;
iface->set_player = mpris2_provider_set_player;
}
-static void mpris2_provider_class_init(Mpris2ProviderClass *klass)
-{
+static void mpris2_provider_class_init(Mpris2ProviderClass *klass) {
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = mpris2_provider_finalize;
}
-static void mpris2_provider_init(Mpris2Provider *provider)
-{
+static void mpris2_provider_init(Mpris2Provider *provider) {
provider->player = NULL;
provider->conf = NULL;
}
-static void mpris2_provider_finalize(GObject *object)
-{
+static void mpris2_provider_finalize(GObject *object) {
Mpris2Provider *provider;
provider = MPRIS2_PROVIDER(object);
diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c
index 605814a..4e4ed53 100644
--- a/src/plugins/notify/notify-plugin.c
+++ b/src/plugins/notify/notify-plugin.c
@@ -33,8 +33,7 @@ G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugi
G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize(ParoleProviderPlugin *plugin)
-{
+parole_plugin_initialize(ParoleProviderPlugin *plugin) {
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
notify_provider_register_type(plugin);
@@ -43,6 +42,5 @@ parole_plugin_initialize(ParoleProviderPlugin *plugin)
}
G_MODULE_EXPORT void
-parole_plugin_shutdown(void)
-{
+parole_plugin_shutdown(void) {
}
diff --git a/src/plugins/notify/notify-provider.c b/src/plugins/notify/notify-provider.c
index 9946bd3..0265990 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -37,13 +37,11 @@ static void notify_provider_iface_init(ParoleProviderPluginIface *iface);
static void notify_provider_finalize(GObject *object);
-struct _NotifyProviderClass
-{
+struct _NotifyProviderClass {
GObjectClass parent_class;
};
-struct _NotifyProvider
-{
+struct _NotifyProvider {
GObject parent;
ParoleProviderPlayer *player;
gchar *last_played_uri;
@@ -52,27 +50,23 @@ struct _NotifyProvider
};
PAROLE_DEFINE_TYPE_WITH_CODE(NotifyProvider,
- notify_provider,
- G_TYPE_OBJECT,
- PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
- notify_provider_iface_init));
+ notify_provider,
+ G_TYPE_OBJECT,
+ PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
+ notify_provider_iface_init));
static void
-notification_closed_cb(NotifyNotification *n, NotifyProvider *notify)
-{
+notification_closed_cb(NotifyNotification *n, NotifyProvider *notify) {
g_object_unref(notify->notification);
notify->notification = NULL;
}
static void
-close_notification(NotifyProvider *notify)
-{
- if ( notify->notification )
- {
+close_notification(NotifyProvider *notify) {
+ if ( notify->notification ) {
GError *error = NULL;
notify_notification_close(notify->notification, &error);
- if ( error )
- {
+ if ( error ) {
g_warning("Failed to close notification : %s", error->message);
g_error_free(error);
}
@@ -82,20 +76,17 @@ close_notification(NotifyProvider *notify)
}
static void
-on_previous_clicked(NotifyNotification *notification, char *action, NotifyProvider *notify)
-{
+on_previous_clicked(NotifyNotification *notification, char *action, NotifyProvider *notify) {
parole_provider_player_play_previous(notify->player);
}
static void
-on_next_clicked(NotifyNotification *notification, char *action, NotifyProvider *notify)
-{
+on_next_clicked(NotifyNotification *notification, char *action, NotifyProvider *notify) {
parole_provider_player_play_next(notify->player);
}
static void
-notify_playing(NotifyProvider *notify, const ParoleStream *stream)
-{
+notify_playing(NotifyProvider *notify, const ParoleStream *stream) {
GdkPixbuf *pix;
gboolean has_video, enabled;
gchar *title, *album, *artist, *year, *stream_uri;
@@ -104,14 +95,14 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
GSimpleAction *action;
g_object_get(G_OBJECT(stream),
- "title", &title,
- "album", &album,
- "artist", &artist,
- "year", &year,
- "has-video", &has_video,
- "media-type", &media_type,
- "uri", &stream_uri,
- NULL);
+ "title", &title,
+ "album", &album,
+ "artist", &artist,
+ "year", &year,
+ "has-video", &has_video,
+ "media-type", &media_type,
+ "uri", &stream_uri,
+ NULL);
if ( g_strcmp0(stream_uri, notify->last_played_uri) == 0 )
return;
@@ -122,8 +113,7 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
if ( has_video )
return;
- if ( !title )
- {
+ if ( !title ) {
gchar *uri;
gchar *filename;
g_object_get(G_OBJECT(stream),
@@ -132,8 +122,7 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
filename = g_filename_from_uri(uri, NULL, NULL);
g_free(uri);
- if ( filename )
- {
+ if ( filename ) {
title = g_path_get_basename(filename);
g_free(filename);
if ( !title )
@@ -146,10 +135,9 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
if (!artist)
artist = g_strdup(_("Unknown Artist"));
- if (!year)
+ if (!year) {
message = g_strdup_printf("%s %s\n%s %s", _("<i>on</i>"), album, _("<i>by</i>"), artist);
- else
- {
+ } else {
message = g_strdup_printf("%s %s(%s)\n%s %s", _("<i>on</i>"), album, year, _("<i>by</i>"), artist);
g_free(year);
}
@@ -185,8 +173,7 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
GTK_ICON_LOOKUP_USE_BUILTIN,
NULL);
- if ( pix )
- {
+ if ( pix ) {
notify_notification_set_icon_from_pixbuf(notify->notification, pix);
g_object_unref(pix);
}
@@ -198,12 +185,11 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
g_object_get(G_OBJECT(action),
"enabled", &enabled,
NULL);
- if (enabled)
- {
- notify_notification_add_action(notify->notification,
- "play-previous", _("Previous Track"),
- NOTIFY_ACTION_CALLBACK(on_previous_clicked),
- notify, NULL);
+ if (enabled) {
+ notify_notification_add_action(notify->notification,
+ "play-previous", _("Previous Track"),
+ NOTIFY_ACTION_CALLBACK(on_previous_clicked),
+ notify, NULL);
}
/* Only show Next Track item if clicking next is possible */
@@ -211,12 +197,11 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
g_object_get(G_OBJECT(action),
"enabled", &enabled,
NULL);
- if (enabled)
- {
- notify_notification_add_action(notify->notification,
- "play-next", _("Next Track"),
- NOTIFY_ACTION_CALLBACK(on_next_clicked),
- notify, NULL);
+ if (enabled) {
+ notify_notification_add_action(notify->notification,
+ "play-next", _("Next Track"),
+ NOTIFY_ACTION_CALLBACK(on_next_clicked),
+ notify, NULL);
}
notify_notification_show(notify->notification, NULL);
@@ -225,8 +210,7 @@ notify_playing(NotifyProvider *notify, const ParoleStream *stream)
}
static void
-state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, NotifyProvider *notify)
-{
+state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, NotifyProvider *notify) {
if ( state == PAROLE_STATE_PLAYING )
notify_playing(notify, stream);
@@ -234,14 +218,12 @@ state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, Parol
close_notification(notify);
}
-static gboolean notify_provider_is_configurable(ParoleProviderPlugin *plugin)
-{
+static gboolean notify_provider_is_configurable(ParoleProviderPlugin *plugin) {
return FALSE;
}
static void
-notify_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
-{
+notify_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player) {
NotifyProvider *notify;
notify = NOTIFY_PROVIDER(plugin);
@@ -256,26 +238,22 @@ notify_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *p
}
static void
-notify_provider_iface_init(ParoleProviderPluginIface *iface)
-{
+notify_provider_iface_init(ParoleProviderPluginIface *iface) {
iface->get_is_configurable = notify_provider_is_configurable;
iface->set_player = notify_provider_set_player;
}
-static void notify_provider_class_init(NotifyProviderClass *klass)
-{
+static void notify_provider_class_init(NotifyProviderClass *klass) {
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = notify_provider_finalize;
}
-static void notify_provider_init(NotifyProvider *provider)
-{
+static void notify_provider_init(NotifyProvider *provider) {
provider->player = NULL;
}
-static void notify_provider_finalize(GObject *object)
-{
+static void notify_provider_finalize(GObject *object) {
NotifyProvider *notify;
notify = NOTIFY_PROVIDER(object);
diff --git a/src/plugins/sample/sample-plugin.c b/src/plugins/sample/sample-plugin.c
index 295838f..34f59f5 100644
--- a/src/plugins/sample/sample-plugin.c
+++ b/src/plugins/sample/sample-plugin.c
@@ -33,14 +33,12 @@ G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize(ParoleProviderPlugin *plugin)
-{
+parole_plugin_initialize(ParoleProviderPlugin *plugin) {
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
sample_provider_register_type(plugin);
return SAMPLE_TYPE_PROVIDER;
}
G_MODULE_EXPORT void
-parole_plugin_shutdown(void)
-{
+parole_plugin_shutdown(void) {
}
diff --git a/src/plugins/sample/sample-provider.c b/src/plugins/sample/sample-provider.c
index d372c89..4f2cb6c 100644
--- a/src/plugins/sample/sample-provider.c
+++ b/src/plugins/sample/sample-provider.c
@@ -30,13 +30,11 @@ static void sample_provider_iface_init(ParoleProviderPluginIface *iface);
static void sample_provider_finalize(GObject *object);
-struct _SampleProviderClass
-{
+struct _SampleProviderClass {
GObjectClass parent_class;
};
-struct _SampleProvider
-{
+struct _SampleProvider {
GObject parent;
ParoleProviderPlayer *player;
};
@@ -47,14 +45,12 @@ PAROLE_DEFINE_TYPE_WITH_CODE(SampleProvider,
PAROLE_IMPLEMENT_INTERFACE(PAROLE_TYPE_PROVIDER_PLUGIN,
sample_provider_iface_init));
-static gboolean sample_provider_is_configurable(ParoleProviderPlugin *plugin)
-{
+static gboolean sample_provider_is_configurable(ParoleProviderPlugin *plugin) {
return FALSE;
}
static void
-sample_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
-{
+sample_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player) {
SampleProvider *provider;
provider = SAMPLE_PROVIDER(plugin);
@@ -62,25 +58,21 @@ sample_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *p
}
static void
-sample_provider_iface_init(ParoleProviderPluginIface *iface)
-{
+sample_provider_iface_init(ParoleProviderPluginIface *iface) {
iface->get_is_configurable = sample_provider_is_configurable;
iface->set_player = sample_provider_set_player;
}
-static void sample_provider_class_init(SampleProviderClass *klass)
-{
+static void sample_provider_class_init(SampleProviderClass *klass) {
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = sample_provider_finalize;
}
-static void sample_provider_init(SampleProvider *provider)
-{
+static void sample_provider_init(SampleProvider *provider) {
provider->player = NULL;
}
-static void sample_provider_finalize(GObject *object)
-{
+static void sample_provider_finalize(GObject *object) {
G_OBJECT_CLASS(sample_provider_parent_class)->finalize(object);
}
diff --git a/src/plugins/tray/tray-plugin.c b/src/plugins/tray/tray-plugin.c
index 2058fbf..9186b2b 100644
--- a/src/plugins/tray/tray-plugin.c
+++ b/src/plugins/tray/tray-plugin.c
@@ -33,8 +33,7 @@ G_MODULE_EXPORT GType parole_plugin_initialize(ParoleProviderPlugin *plugin);
G_MODULE_EXPORT void parole_plugin_shutdown(void);
G_MODULE_EXPORT GType
-parole_plugin_initialize(ParoleProviderPlugin *plugin)
-{
+parole_plugin_initialize(ParoleProviderPlugin *plugin) {
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
tray_provider_register_type(plugin);
@@ -43,6 +42,5 @@ parole_plugin_initialize(ParoleProviderPlugin *plugin)
}
G_MODULE_EXPORT void
-parole_plugin_shutdown(void)
-{
+parole_plugin_shutdown(void) {
}
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 36be712..b3bcfdc 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -40,13 +40,11 @@ static void tray_provider_iface_init(ParoleProviderPluginIface *iface);
static void tray_provider_finalize(GObject *object);
-struct _TrayProviderClass
-{
+struct _TrayProviderClass {
GObjectClass parent_class;
};
-struct _TrayProvider
-{
+struct _TrayProvider {
GObject parent;
ParoleProviderPlayer *player;
GtkStatusIcon *tray;
@@ -64,15 +62,13 @@ PAROLE_DEFINE_TYPE_WITH_CODE(TrayProvider,
tray_provider_iface_init));
static void
-menu_selection_done_cb(TrayProvider *tray)
-{
+menu_selection_done_cb(TrayProvider *tray) {
gtk_widget_destroy(tray->menu);
tray->menu = NULL;
}
static void
-exit_activated_cb(TrayProvider *tray)
-{
+exit_activated_cb(TrayProvider *tray) {
GdkEventAny ev;
menu_selection_done_cb(tray);
@@ -86,8 +82,7 @@ exit_activated_cb(TrayProvider *tray)
}
static void
-play_pause_activated_cb(TrayProvider *tray)
-{
+play_pause_activated_cb(TrayProvider *tray) {
menu_selection_done_cb(tray);
if ( tray->state == PAROLE_STATE_PLAYING )
@@ -97,29 +92,24 @@ play_pause_activated_cb(TrayProvider *tray)
}
static void
-previous_activated_cb(TrayProvider *tray)
-{
+previous_activated_cb(TrayProvider *tray) {
menu_selection_done_cb(tray);
parole_provider_player_play_previous(tray->player);
}
static void
-next_activated_cb(TrayProvider *tray)
-{
+next_activated_cb(TrayProvider *tray) {
menu_selection_done_cb(tray);
parole_provider_player_play_next(tray->player);
}
static void
-open_activated_cb(TrayProvider *tray)
-{
+open_activated_cb(TrayProvider *tray) {
parole_provider_player_open_media_chooser(tray->player);
}
static void
-popup_menu_cb(GtkStatusIcon *icon, guint button,
- guint activate_time, TrayProvider *tray)
-{
+popup_menu_cb(GtkStatusIcon *icon, guint button, guint activate_time, TrayProvider *tray) {
GtkWidget *menu, *mi;
menu = gtk_menu_new();
@@ -195,8 +185,7 @@ popup_menu_cb(GtkStatusIcon *icon, guint button,
}
static void
-tray_activate_cb(GtkStatusIcon *tray_icon, TrayProvider *tray)
-{
+tray_activate_cb(GtkStatusIcon *tray_icon, TrayProvider *tray) {
/* Show the window if it is hidden or does not have focus */
if (!gtk_widget_get_visible(tray->window) || !gtk_window_is_active(GTK_WINDOW(tray->window)))
gtk_window_present(GTK_WINDOW(tray->window));
@@ -205,12 +194,10 @@ tray_activate_cb(GtkStatusIcon *tray_icon, TrayProvider *tray)
}
static void
-state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, TrayProvider *tray)
-{
+state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, TrayProvider *tray) {
tray->state = state;
- if ( tray->menu )
- {
+ if ( tray->menu ) {
gtk_widget_destroy(tray->menu);
tray->menu = NULL;
g_signal_emit_by_name(G_OBJECT(tray->tray), "popup-menu", 0, gtk_get_current_event_time());
@@ -218,8 +205,7 @@ state_changed_cb(ParoleProviderPlayer *player, const ParoleStream *stream, Parol
}
static gboolean
-read_entry_bool(const gchar *entry, gboolean fallback)
-{
+read_entry_bool(const gchar *entry, gboolean fallback) {
XfconfChannel *channel;
gboolean ret_val = fallback;
gchar prop_name[64];
@@ -237,8 +223,7 @@ read_entry_bool(const gchar *entry, gboolean fallback)
}
static void
-write_entry_bool(const gchar *entry, gboolean value)
-{
+write_entry_bool(const gchar *entry, gboolean value) {
XfconfChannel *channel;
gchar prop_name[64];
GValue dst = { 0, };
@@ -253,16 +238,14 @@ write_entry_bool(const gchar *entry, gboolean value)
}
static void
-hide_on_delete_toggled_cb(GtkWidget *widget, gpointer tray)
-{
+hide_on_delete_toggled_cb(GtkWidget *widget, gpointer tray) {
gboolean toggled;
toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
write_entry_bool("minimize-to-tray", toggled);
}
static void
-configure_plugin(TrayProvider *tray, GtkWidget *widget)
-{
+configure_plugin(TrayProvider *tray, GtkWidget *widget) {
GtkWidget *dialog;
GtkWidget *content_area;
@@ -294,8 +277,7 @@ configure_plugin(TrayProvider *tray, GtkWidget *widget)
}
static void
-action_on_hide_confirmed_cb(GtkWidget *widget, gpointer data)
-{
+action_on_hide_confirmed_cb(GtkWidget *widget, gpointer data) {
gboolean toggled;
toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
@@ -304,8 +286,7 @@ action_on_hide_confirmed_cb(GtkWidget *widget, gpointer data)
}
static gboolean
-delete_event_cb(GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
-{
+delete_event_cb(GtkWidget *widget, GdkEvent *ev, TrayProvider *tray) {
GtkWidget *dialog, *check, *content_area, *button;
GtkWidget *minimize, *img;
gboolean confirmed, ret_val = TRUE, minimize_to_tray;
@@ -313,8 +294,7 @@ delete_event_cb(GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
confirmed = read_entry_bool("remember-quit-action", FALSE);
minimize_to_tray = read_entry_bool("minimize-to-tray", TRUE);
- if ( confirmed )
- {
+ if ( confirmed ) {
return minimize_to_tray ? gtk_widget_hide_on_delete (widget) : FALSE;
}
@@ -364,8 +344,7 @@ delete_event_cb(GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
gtk_widget_show_all(GTK_WIDGET(dialog));
- switch (gtk_dialog_run (GTK_DIALOG (dialog)))
- {
+ switch (gtk_dialog_run(GTK_DIALOG(dialog))) {
case GTK_RESPONSE_OK:
{
gtk_widget_hide_on_delete(widget);
@@ -392,14 +371,12 @@ delete_event_cb(GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
return ret_val;
}
-static gboolean tray_provider_is_configurable(ParoleProviderPlugin *plugin)
-{
+static gboolean tray_provider_is_configurable(ParoleProviderPlugin *plugin) {
return TRUE;
}
static void
-tray_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player)
-{
+tray_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *player) {
TrayProvider *tray;
GdkPixbuf *pix;
@@ -424,8 +401,7 @@ tray_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *pla
GTK_ICON_LOOKUP_USE_BUILTIN,
NULL);
- if ( pix )
- {
+ if ( pix ) {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_status_icon_set_from_pixbuf(tray->tray, pix);
G_GNUC_END_IGNORE_DEPRECATIONS
@@ -447,35 +423,30 @@ tray_provider_set_player(ParoleProviderPlugin *plugin, ParoleProviderPlayer *pla
}
static void
-tray_provider_configure(ParoleProviderPlugin *provider, GtkWidget *parent)
-{
+tray_provider_configure(ParoleProviderPlugin *provider, GtkWidget *parent) {
TrayProvider *tray;
tray = TRAY_PROVIDER(provider);
configure_plugin(tray, parent);
}
static void
-tray_provider_iface_init(ParoleProviderPluginIface *iface)
-{
+tray_provider_iface_init(ParoleProviderPluginIface *iface) {
iface->set_player = tray_provider_set_player;
iface->configure = tray_provider_configure;
iface->get_is_configurable = tray_provider_is_configurable;
}
-static void tray_provider_class_init(TrayProviderClass *klass)
-{
+static void tray_provider_class_init(TrayProviderClass *klass) {
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
gobject_class->finalize = tray_provider_finalize;
}
-static void tray_provider_init(TrayProvider *provider)
-{
+static void tray_provider_init(TrayProvider *provider) {
provider->player = NULL;
}
-static void tray_provider_finalize(GObject *object)
-{
+static void tray_provider_finalize(GObject *object) {
TrayProvider *tray;
tray = TRAY_PROVIDER(object);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list