Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Apps
parole
Commits
62239051
Commit
62239051
authored
Jul 19, 2013
by
Simon Steinbeiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop fade-out at closing Parole with audio playing (Fix bug #10059)
parent
1fff37cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
25 deletions
+4
-25
src/gst/parole-gst.c
src/gst/parole-gst.c
+4
-25
No files found.
src/gst/parole-gst.c
View file @
62239051
...
...
@@ -68,8 +68,7 @@ static void parole_gst_play_file_internal (ParoleGst *gst);
static
void
parole_gst_change_state
(
ParoleGst
*
gst
,
GstState
new
);
static
void
parole_gst_terminate_internal
(
ParoleGst
*
gst
,
gboolean
fade_sound
);
static
void
parole_gst_terminate_internal
(
ParoleGst
*
gst
);
static
GdkPixbuf
*
parole_gst_tag_list_get_cover_external
(
ParoleGst
*
gst
);
...
...
@@ -2031,7 +2030,7 @@ parole_gst_check_state_change_timeout (gpointer data)
if
(
ret_val
)
{
parole_gst_terminate_internal
(
gst
,
FALSE
);
parole_gst_terminate_internal
(
gst
);
gst
->
priv
->
state_change_id
=
0
;
return
FALSE
;
}
...
...
@@ -2040,7 +2039,7 @@ parole_gst_check_state_change_timeout (gpointer data)
}
static
void
parole_gst_terminate_internal
(
ParoleGst
*
gst
,
gboolean
fade_sound
)
parole_gst_terminate_internal
(
ParoleGst
*
gst
)
{
gboolean
playing_video
;
...
...
@@ -2055,26 +2054,6 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean fade_sound)
parole_window_busy_cursor
(
GTK_WIDGET
(
gst
)
->
window
);
if
(
fade_sound
&&
gst
->
priv
->
state
==
GST_STATE_PLAYING
&&
!
playing_video
)
{
gdouble
volume
;
gdouble
step
;
volume
=
parole_gst_get_volume
(
gst
);
/*
* Fade-out on exit.
*/
if
(
volume
!=
0
)
{
while
(
volume
>
0
)
{
step
=
volume
-
volume
/
10
;
parole_gst_set_volume
(
gst
,
step
<
0
.
01
?
0
:
step
);
volume
=
parole_gst_get_volume
(
gst
);
g_usleep
(
15000
);
}
}
}
parole_gst_change_state
(
gst
,
GST_STATE_NULL
);
}
...
...
@@ -2663,7 +2642,7 @@ void parole_gst_stop (ParoleGst *gst)
void
parole_gst_terminate
(
ParoleGst
*
gst
)
{
gst
->
priv
->
terminating
=
TRUE
;
parole_gst_terminate_internal
(
gst
,
TRUE
);
parole_gst_terminate_internal
(
gst
);
}
void
parole_gst_shutdown
(
ParoleGst
*
gst
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment