[Xfce4-commits] [apps/parole] 01/02: Minor cleanup
noreply at xfce.org
noreply at xfce.org
Tue Jun 17 07:12:31 CEST 2014
This is an automated email from the git hooks/post-receive script.
bluesabre pushed a commit to branch master
in repository apps/parole.
commit 8e1327395f531a206ed17523b36bf50c3c0fa624
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Mon Jun 16 22:22:00 2014 -0400
Minor cleanup
---
src/gst/parole-gst.c | 4 ++--
src/gst/parole-gst.h | 54 ++++++++++++++++++++++++----------------------
src/parole-conf-dialog.c | 1 -
src/parole-player.c | 2 +-
4 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 4c5a97d..da30356 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -3009,11 +3009,11 @@ const ParoleStream *parole_gst_get_stream (ParoleGst *gst)
return gst->priv->stream;
}
-const 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,
NULL);
return video_sink;
-}
\ No newline at end of file
+}
diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h
index 6793675..75a7605 100644
--- a/src/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -44,7 +44,7 @@ typedef enum
PAROLE_ASPECT_RATIO_4_3,
PAROLE_ASPECT_RATIO_16_9,
PAROLE_ASPECT_RATIO_DVB
-
+
} ParoleAspectRatio;
enum
@@ -62,47 +62,47 @@ typedef struct
{
GtkWidget parent;
ParoleGstPrivate *priv;
-
+
} ParoleGst;
typedef struct
{
GtkWidgetClass parent_class;
-
+
void (*media_state) (ParoleGst *gst,
const ParoleStream *stream,
ParoleState state);
-
+
void (*media_progressed) (ParoleGst *gst,
const ParoleStream *stream,
gint64 value);
-
+
void (*media_seeked) (ParoleGst *gst,
const ParoleStream *stream);
-
+
void (*buffering) (ParoleGst *gst,
const ParoleStream *stream,
gint percentage);
-
+
void (*media_tag) (ParoleGst *gst,
const ParoleStream *stream);
-
+
void (*error) (ParoleGst *gst,
const gchar *error);
-
+
void (*dvd_chapter_change) (ParoleGst *gst,
gint dvd_chapter_change);
-
+
void (*dvd_chapter_count_change) (ParoleGst *gst,
gint dvd_chapter_change);
-
+
} ParoleGstClass;
GType parole_gst_get_type (void) G_GNUC_CONST;
GtkWidget *parole_gst_new (gpointer conf_obj);
GtkWidget *parole_gst_get (void);
-void parole_gst_set_custom_subtitles (ParoleGst *gst,
+void parole_gst_set_custom_subtitles (ParoleGst *gst,
const gchar* sub_file);
gchar* parole_gst_get_file_uri (ParoleGst *gst);
@@ -126,7 +126,7 @@ void parole_gst_seek (ParoleGst *gst,
void parole_gst_set_volume (ParoleGst *gst,
gdouble value);
-
+
gdouble parole_gst_get_volume (ParoleGst *gst);
ParoleState parole_gst_get_state (ParoleGst *gst);
@@ -134,13 +134,13 @@ GstState parole_gst_get_gst_state (ParoleGst *gst);
GstState parole_gst_get_gst_target_state (ParoleGst *gst);
void
-parole_gst_send_navigation_command (ParoleGst *gst,
+parole_gst_send_navigation_command (ParoleGst *gst,
gint command);
void parole_gst_next_dvd_chapter (ParoleGst *gst);
void parole_gst_prev_dvd_chapter (ParoleGst *gst);
-void parole_gst_set_dvd_chapter (ParoleGst *gst,
+void parole_gst_set_dvd_chapter (ParoleGst *gst,
gint chapter);
void parole_gst_next_cdda_track (ParoleGst *gst);
@@ -150,10 +150,10 @@ gint parole_gst_get_num_tracks (ParoleGst *gst);
void parole_gst_seek_cdda (ParoleGst *gst,
guint track_num);
-gint
+gint
parole_gst_get_current_cdda_track (ParoleGst *gst);
-ParoleMediaType
+ParoleMediaType
parole_gst_get_current_stream_type (ParoleGst *gst);
gint64 parole_gst_get_stream_duration (ParoleGst *gst);
@@ -161,24 +161,26 @@ gint64 parole_gst_get_stream_position (ParoleGst *gst);
gboolean parole_gst_get_is_xvimage_sink (ParoleGst *gst);
-void parole_gst_set_cursor_visible (ParoleGst *gst,
- gboolean visible);
-
-GList * gst_get_lang_list_for_type (ParoleGst * gst,
+void parole_gst_set_cursor_visible (ParoleGst *gst,
+ gboolean visible);
+
+GstElement *parole_gst_video_sink (ParoleGst *gst);
+
+GList * gst_get_lang_list_for_type (ParoleGst * gst,
const gchar * type_name);
gboolean gst_get_has_vis (ParoleGst *gst);
gboolean gst_get_has_video (ParoleGst *gst);
-void gst_set_current_audio_track (ParoleGst *gst,
+void gst_set_current_audio_track (ParoleGst *gst,
gint track_no);
-
-void gst_set_current_subtitle_track (ParoleGst *gst,
+
+void gst_set_current_subtitle_track (ParoleGst *gst,
gint track_no);
-const ParoleStream
+const ParoleStream
*parole_gst_get_stream (ParoleGst *gst);
-
+
G_END_DECLS
#endif /* __PAROLE_GST_H */
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index cc540ad..c492890 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -337,7 +337,6 @@ static gboolean
parole_conf_dialog_set_default_sink_plugin (ParoleConfDialog *self)
{
gchar *sink_name;
- gchar *combox_text;
gboolean ret = FALSE;
g_object_get (G_OBJECT (self->priv->conf),
diff --git a/src/parole-player.c b/src/parole-player.c
index 26a2aca..e8d201b 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3551,7 +3551,7 @@ parole_player_init (ParolePlayer *player)
TRUE, TRUE, 0);
stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (clutterbox));
texture = CLUTTER_ACTOR (g_object_new (CLUTTER_TYPE_TEXTURE, "disable-slicing", TRUE, NULL));
- video_sink = parole_gst_video_sink (player->priv->gst);
+ video_sink = parole_gst_video_sink (PAROLE_GST(player->priv->gst));
g_object_set (video_sink, "texture", texture, NULL);
clutter_actor_add_child (stage, texture);
gtk_widget_show (clutterbox);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list