Mercurial > audlegacy
annotate src/audacious/playback.c @ 3337:99f34db2c3fc trunk
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
- modify playlist_load_ins() to return number of new entries.
author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
---|---|
date | Sun, 12 Aug 2007 21:21:46 +0900 |
parents | 6dbb73b8e28c |
children | 71d8d93f1bad |
rev | line source |
---|---|
2313 | 1 /* Audacious - Cross-platform multimedia player |
2 * Copyright (C) 2005-2007 Audacious development team | |
3 * | |
4 * Based on BMP: | |
5 * Copyright (C) 2003-2004 BMP development team. | |
6 * | |
7 * Based on XMMS: | |
8 * Copyright (C) 1998-2003 XMMS development team. | |
9 * | |
10 * This program is free software; you can redistribute it and/or modify | |
11 * it under the terms of the GNU General Public License as published by | |
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
3093
diff
changeset
|
12 * the Free Software Foundation; under version 3 of the License. |
2313 | 13 * |
14 * This program is distributed in the hope that it will be useful, | |
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 * GNU General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
3093
diff
changeset
|
20 * along with this program. If not, see <http://www.gnu.org/licenses>. |
3123
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
21 * |
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
22 * The Audacious team does not consider modular code linking to |
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
23 * Audacious or using our public API to be a derived work. |
2313 | 24 */ |
25 | |
26 #ifdef HAVE_CONFIG_H | |
27 # include "config.h" | |
28 #endif | |
29 | |
30 #include <glib.h> | |
31 #include <glib/gi18n.h> | |
32 #include <glib/gprintf.h> | |
33 #include <stdlib.h> | |
34 #include <string.h> | |
35 #include <time.h> | |
36 | |
37 #include <unistd.h> | |
38 #include <sys/types.h> | |
39 #include <sys/stat.h> | |
40 #include <dirent.h> | |
41 | |
2717 | 42 #include "configdb.h" |
2313 | 43 |
2420 | 44 #include "hook.h" |
3152
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
45 #include "eventqueue.h" |
2313 | 46 #include "input.h" |
47 #include "main.h" | |
48 #include "ui_equalizer.h" | |
49 #include "output.h" | |
50 #include "playlist.h" | |
2420 | 51 #include "ui_main.h" |
2313 | 52 #include "ui_playlist.h" |
53 #include "ui_skinselector.h" | |
3072
84de3244aeaa
replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents:
3054
diff
changeset
|
54 #include "ui_skinned_playstatus.h" |
2313 | 55 #include "util.h" |
3082
91df04ec5ef7
From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents:
3042
diff
changeset
|
56 #include "visualization.h" |
3251 | 57 #include "skin.h" |
2313 | 58 |
59 #include "playback.h" | |
3152
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
60 #include "playback_evlisteners.h" |
2313 | 61 |
3018
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
62 static int song_info_timeout_source = 0; |
2313 | 63 |
3319
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
64 |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
65 static gint |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
66 playback_set_pb_ready(InputPlayback *playback) |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
67 { |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
68 g_mutex_lock(playback->pb_ready_mutex); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
69 playback->pb_ready_val = 1; |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
70 g_cond_signal(playback->pb_ready_cond); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
71 g_mutex_unlock(playback->pb_ready_mutex); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
72 return 0; |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
73 } |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
74 |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
75 static gint |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
76 playback_wait_for_pb_ready(InputPlayback *playback) |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
77 { |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
78 g_mutex_lock(playback->pb_ready_mutex); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
79 while (playback->pb_ready_val != 1) |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
80 g_cond_wait(playback->pb_ready_cond, playback->pb_ready_mutex); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
81 g_mutex_unlock(playback->pb_ready_mutex); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
82 return 0; |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
83 } |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
84 |
3152
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
85 void |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
86 playback_eof(void) |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
87 { |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
88 event_queue("playback eof", playlist_get_active()); |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
89 } |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
90 |
3158
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
91 void |
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
92 playback_error(void) |
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
93 { |
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
94 event_queue("playback audio error", NULL); |
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
95 } |
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
96 |
2313 | 97 gint |
98 playback_get_time(void) | |
99 { | |
2438
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
100 InputPlayback *playback; |
2420 | 101 g_return_val_if_fail(playback_get_playing(), -1); |
2438
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
102 playback = get_current_input_playback(); |
2313 | 103 |
3180
384cb84c968f
Gracefully handle playback being NULL even if playback_get_playing() is TRUE during playback init.
Christian Birchinger <joker@netswarm.net>
parents:
3179
diff
changeset
|
104 if (!playback) /* playback can be NULL during init even if playing is TRUE */ |
384cb84c968f
Gracefully handle playback being NULL even if playback_get_playing() is TRUE during playback init.
Christian Birchinger <joker@netswarm.net>
parents:
3179
diff
changeset
|
105 return -1; |
2438
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
106 if (playback->plugin->get_time) |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
107 return playback->plugin->get_time(playback); |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
108 if (playback->error) |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
109 return -2; |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
110 if (!playback->playing || |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
111 (playback->eof && !playback->output->buffer_playing())) |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
112 return -1; |
8750a62abed8
[svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents:
2436
diff
changeset
|
113 return playback->output->output_time(); |
2313 | 114 } |
115 | |
116 void | |
117 playback_initiate(void) | |
118 { | |
119 PlaylistEntry *entry = NULL; | |
120 Playlist *playlist = playlist_get_active(); | |
121 | |
2420 | 122 g_return_if_fail(playlist_get_length(playlist) != 0); |
2313 | 123 |
3152
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
124 /* initialize playback event listeners if not done already */ |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
125 playback_evlistener_init(); |
c9471f83944c
Add playback_eof(). Plugins should use this instead of playback->eof = 1.
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
126 |
2313 | 127 if (playback_get_playing()) |
128 playback_stop(); | |
129 | |
3020 | 130 ui_vis_clear_data(mainwin_vis); |
3054 | 131 ui_svis_clear_data(mainwin_svis); |
2313 | 132 mainwin_disable_seekbar(); |
133 | |
134 entry = playlist_get_entry_to_play(playlist); | |
2420 | 135 g_return_if_fail(entry != NULL); |
2592
6f7be3702c5f
[svn] - revert the penalty-based "find something to play" logic of 1.2. it's
nenolod
parents:
2454
diff
changeset
|
136 playback_play_file(entry); |
2313 | 137 |
3179
d2eae001e562
I don't think that's needed. If you revert it, use playback_get_playing() instead.
Christian Birchinger <joker@netswarm.net>
parents:
3170
diff
changeset
|
138 // if (playback_get_time() != -1) { |
2313 | 139 equalizerwin_load_auto_preset(entry->filename); |
140 input_set_eq(cfg.equalizer_active, cfg.equalizer_preamp, | |
141 cfg.equalizer_bands); | |
142 output_set_eq(cfg.equalizer_active, cfg.equalizer_preamp, | |
143 cfg.equalizer_bands); | |
3179
d2eae001e562
I don't think that's needed. If you revert it, use playback_get_playing() instead.
Christian Birchinger <joker@netswarm.net>
parents:
3170
diff
changeset
|
144 // } |
2313 | 145 |
146 playlist_check_pos_current(playlist); | |
3018
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
147 mainwin_update_song_info(); |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
148 |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
149 /* FIXME: use g_timeout_add_seconds when glib-2.14 is required */ |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
150 song_info_timeout_source = g_timeout_add(1000, |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
151 (GSourceFunc) mainwin_update_song_info, NULL); |
2407
1dc1d36d0347
[svn] - add hooks: playback begin, playback end, playlist reached end
nenolod
parents:
2366
diff
changeset
|
152 |
3000
bbca1e0e054a
don't call gtk_widget_show/hide from func that's called every now and then
Tomasz Mon <desowin@gmail.com>
parents:
2976
diff
changeset
|
153 if (cfg.player_shaded) { |
bbca1e0e054a
don't call gtk_widget_show/hide from func that's called every now and then
Tomasz Mon <desowin@gmail.com>
parents:
2976
diff
changeset
|
154 gtk_widget_show(mainwin_stime_min); |
bbca1e0e054a
don't call gtk_widget_show/hide from func that's called every now and then
Tomasz Mon <desowin@gmail.com>
parents:
2976
diff
changeset
|
155 gtk_widget_show(mainwin_stime_sec); |
3042
01ae56759d15
mainwin_sposition is now UiSkinnedHorizontalSlider
Tomasz Mon <desowin@gmail.com>
parents:
3041
diff
changeset
|
156 gtk_widget_show(mainwin_sposition); |
3001
6d4b7b739232
fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents:
3000
diff
changeset
|
157 } else { |
6d4b7b739232
fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents:
3000
diff
changeset
|
158 gtk_widget_show(mainwin_minus_num); |
6d4b7b739232
fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents:
3000
diff
changeset
|
159 gtk_widget_show(mainwin_10min_num); |
6d4b7b739232
fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents:
3000
diff
changeset
|
160 gtk_widget_show(mainwin_min_num); |
6d4b7b739232
fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents:
3000
diff
changeset
|
161 gtk_widget_show(mainwin_10sec_num); |
6d4b7b739232
fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents:
3000
diff
changeset
|
162 gtk_widget_show(mainwin_sec_num); |
3040
067e0186623a
import UiSkinnedHorizontalSlider
Tomasz Mon <desowin@gmail.com>
parents:
3021
diff
changeset
|
163 gtk_widget_show(mainwin_position); |
3000
bbca1e0e054a
don't call gtk_widget_show/hide from func that's called every now and then
Tomasz Mon <desowin@gmail.com>
parents:
2976
diff
changeset
|
164 } |
bbca1e0e054a
don't call gtk_widget_show/hide from func that's called every now and then
Tomasz Mon <desowin@gmail.com>
parents:
2976
diff
changeset
|
165 |
3082
91df04ec5ef7
From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents:
3042
diff
changeset
|
166 vis_playback_start(); |
3092
1ddeb9f068ab
Backed out changeset b87335249c69d45d253b1b960a9ec7f60b68e5a5
William Pitcock <nenolod@atheme-project.org>
parents:
3089
diff
changeset
|
167 |
1ddeb9f068ab
Backed out changeset b87335249c69d45d253b1b960a9ec7f60b68e5a5
William Pitcock <nenolod@atheme-project.org>
parents:
3089
diff
changeset
|
168 hook_call("playback begin", entry); |
2313 | 169 } |
170 | |
171 void | |
172 playback_pause(void) | |
173 { | |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
174 InputPlayback *playback; |
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
175 |
2313 | 176 if (!playback_get_playing()) |
177 return; | |
178 | |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
179 if ((playback = get_current_input_playback()) == NULL) |
2313 | 180 return; |
181 | |
182 ip_data.paused = !ip_data.paused; | |
183 | |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
184 if (playback->plugin->pause) |
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
185 playback->plugin->pause(playback, ip_data.paused); |
2313 | 186 |
3039
c981df78db8c
added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents:
3021
diff
changeset
|
187 if (ip_data.paused) |
c981df78db8c
added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents:
3021
diff
changeset
|
188 hook_call("playback pause", NULL); |
c981df78db8c
added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents:
3021
diff
changeset
|
189 else |
c981df78db8c
added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents:
3021
diff
changeset
|
190 hook_call("playback unpause", NULL); |
c981df78db8c
added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents:
3021
diff
changeset
|
191 |
2313 | 192 g_return_if_fail(mainwin_playstatus != NULL); |
193 | |
194 if (ip_data.paused) | |
3072
84de3244aeaa
replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents:
3054
diff
changeset
|
195 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PAUSE); |
2313 | 196 else |
3072
84de3244aeaa
replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents:
3054
diff
changeset
|
197 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY); |
2313 | 198 } |
199 | |
200 void | |
201 playback_stop(void) | |
202 { | |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
203 InputPlayback *playback; |
3252
eddeaebaf1c7
- fixed ugly race condition in new threading model; mutexes are also probably required to handle shared access to ip_data
Giacomo Lozito <james@develia.org>
parents:
3251
diff
changeset
|
204 |
3253
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
205 if ((playback = get_current_input_playback()) == NULL) |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
206 return; |
2313 | 207 |
3252
eddeaebaf1c7
- fixed ugly race condition in new threading model; mutexes are also probably required to handle shared access to ip_data
Giacomo Lozito <james@develia.org>
parents:
3251
diff
changeset
|
208 if (ip_data.playing) |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
209 { |
3319
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
210 /* wait for plugin to signal it has reached |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
211 the 'playback safe state' before stopping */ |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
212 playback_wait_for_pb_ready(playback); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
213 |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
214 if (playback_get_paused() == TRUE) |
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
215 { |
3258
d899694663a7
in playback_stop, do not assume that get_written_time will be always > 0, some plugins do not write to output at all
Giacomo Lozito <james@develia.org>
parents:
3253
diff
changeset
|
216 if (get_written_time() > 0) |
d899694663a7
in playback_stop, do not assume that get_written_time will be always > 0, some plugins do not write to output at all
Giacomo Lozito <james@develia.org>
parents:
3253
diff
changeset
|
217 output_flush(get_written_time()); /* to avoid noise */ |
2313 | 218 playback_pause(); |
219 } | |
220 | |
3319
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
221 ip_data.playing = FALSE; |
2313 | 222 |
3170
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
223 if (playback->plugin->stop) |
603577228518
get_current_input_playback() cleanups.
William Pitcock <nenolod@atheme-project.org>
parents:
3168
diff
changeset
|
224 playback->plugin->stop(playback); |
2313 | 225 |
3181
1596dcb77acd
Track playback monitor thread in InputPlayback.thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3170
diff
changeset
|
226 if (playback->thread != NULL) |
3326
6dbb73b8e28c
thread sanity checks
William Pitcock <nenolod@atheme-project.org>
parents:
3325
diff
changeset
|
227 { |
3181
1596dcb77acd
Track playback monitor thread in InputPlayback.thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3170
diff
changeset
|
228 g_thread_join(playback->thread); |
3326
6dbb73b8e28c
thread sanity checks
William Pitcock <nenolod@atheme-project.org>
parents:
3325
diff
changeset
|
229 playback->thread = NULL; |
6dbb73b8e28c
thread sanity checks
William Pitcock <nenolod@atheme-project.org>
parents:
3325
diff
changeset
|
230 } |
3181
1596dcb77acd
Track playback monitor thread in InputPlayback.thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3170
diff
changeset
|
231 |
2313 | 232 free_vis_data(); |
233 ip_data.paused = FALSE; | |
234 | |
3319
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
235 if (playback->pb_ready_mutex) |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
236 g_mutex_free(playback->pb_ready_mutex); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
237 if (playback->pb_ready_cond) |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
238 g_cond_free(playback->pb_ready_cond); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
239 |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
240 g_free(playback->filename); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
241 g_free(playback); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
242 set_current_input_playback(NULL); |
2313 | 243 } |
244 | |
245 ip_data.buffering = FALSE; | |
246 ip_data.playing = FALSE; | |
3018
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
247 |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
248 if (song_info_timeout_source) |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
249 g_source_remove(song_info_timeout_source); |
6a9fdd5aee3a
Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents:
3001
diff
changeset
|
250 |
3082
91df04ec5ef7
From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents:
3042
diff
changeset
|
251 vis_playback_stop(); |
91df04ec5ef7
From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents:
3042
diff
changeset
|
252 |
2313 | 253 g_return_if_fail(mainwin_playstatus != NULL); |
3072
84de3244aeaa
replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents:
3054
diff
changeset
|
254 ui_skinned_playstatus_set_buffering(mainwin_playstatus, FALSE); |
2313 | 255 } |
256 | |
257 static void | |
258 run_no_output_plugin_dialog(void) | |
259 { | |
260 const gchar *markup = | |
261 N_("<b><big>No output plugin selected.</big></b>\n" | |
262 "You have not selected an output plugin."); | |
263 | |
264 GtkWidget *dialog = | |
265 gtk_message_dialog_new_with_markup(GTK_WINDOW(mainwin), | |
266 GTK_DIALOG_DESTROY_WITH_PARENT, | |
267 GTK_MESSAGE_ERROR, | |
268 GTK_BUTTONS_OK, | |
269 _(markup)); | |
270 gtk_dialog_run(GTK_DIALOG(dialog)); | |
271 gtk_widget_destroy(dialog); | |
272 } | |
273 | |
3153
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
274 static gpointer |
3154
732cfad87116
Made a mistake here. Fixing!
William Pitcock <nenolod@atheme-project.org>
parents:
3153
diff
changeset
|
275 playback_monitor_thread(gpointer data) |
3153
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
276 { |
3253
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
277 InputPlayback *playback = (InputPlayback *) data; |
3153
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
278 |
3253
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
279 playback->plugin->play_file(playback); |
3153
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
280 |
3319
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
281 /* if play_file has not reached the 'safe state' before returning (an error |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
282 occurred), set the playback ready value to 1 now, to allow for proper stop */ |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
283 playback_set_pb_ready(playback); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
284 |
3158
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
285 if (!playback->error && ip_data.playing) |
3156
4a0e216bc825
playback monitor thread: If forced stop occurs, do not queue "playback eof" signal.
William Pitcock <nenolod@atheme-project.org>
parents:
3155
diff
changeset
|
286 playback_eof(); |
3158
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
287 else if (playback->error) |
92717dcb09f6
Send a message from the monitor thread to the main thread for audio errors, like we do with eof condition.
William Pitcock <nenolod@atheme-project.org>
parents:
3156
diff
changeset
|
288 playback_error(); |
3153
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
289 |
3181
1596dcb77acd
Track playback monitor thread in InputPlayback.thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3170
diff
changeset
|
290 playback->thread = NULL; |
1596dcb77acd
Track playback monitor thread in InputPlayback.thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3170
diff
changeset
|
291 g_thread_exit(NULL); |
3153
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
292 return NULL; |
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
293 } |
e0a2ea93f98f
New threading model for playback. Playback code should now *block*.
William Pitcock <nenolod@atheme-project.org>
parents:
3152
diff
changeset
|
294 |
2313 | 295 gboolean |
296 playback_play_file(PlaylistEntry *entry) | |
297 { | |
3254 | 298 InputPlayback *playback; |
299 | |
2313 | 300 g_return_val_if_fail(entry != NULL, FALSE); |
301 | |
302 if (!get_current_output_plugin()) { | |
303 run_no_output_plugin_dialog(); | |
304 mainwin_stop_pushed(); | |
305 return FALSE; | |
306 } | |
307 | |
308 if (cfg.random_skin_on_play) | |
2443
93686e8815a4
[svn] - Changed playback_set_random_skin() to skin_set_random_skin()
mf0102
parents:
2438
diff
changeset
|
309 skin_set_random_skin(); |
2313 | 310 |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
311 if (!entry->decoder) |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
312 { |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
313 ProbeResult *pr = input_check_file(entry->filename, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
314 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
315 if (pr != NULL) |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
316 { |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
317 entry->decoder = pr->ip; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
318 entry->tuple = pr->tuple; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
319 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
320 g_free(pr); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
321 } |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
322 } |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
323 |
3128
343504d43afc
Fix warnings.
William Pitcock <nenolod@atheme-project.org>
parents:
3127
diff
changeset
|
324 if (!entry->decoder || !input_is_enabled(entry->decoder->filename)) |
2313 | 325 { |
2436
f346d30bf5ab
[svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents:
2420
diff
changeset
|
326 set_current_input_playback(NULL); |
2313 | 327 |
328 return FALSE; | |
329 } | |
330 | |
3092
1ddeb9f068ab
Backed out changeset b87335249c69d45d253b1b960a9ec7f60b68e5a5
William Pitcock <nenolod@atheme-project.org>
parents:
3089
diff
changeset
|
331 ip_data.playing = TRUE; |
3253
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
332 |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
333 playback = g_new0(InputPlayback, 1); |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
334 |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
335 entry->decoder->output = &psuedo_output_plugin; |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
336 |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
337 playback->plugin = entry->decoder; |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
338 playback->output = &psuedo_output_plugin; |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
339 playback->filename = g_strdup(entry->filename); |
3319
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
340 playback->pb_ready_mutex = g_mutex_new(); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
341 playback->pb_ready_cond = g_cond_new(); |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
342 playback->pb_ready_val = 0; |
d4f6507cded3
added a system that allows input plugins to signal to the core (actually, they MUST do it) that they're ready for playback and it's safe to call their stop function; this fixes a nasty race condition that triggered on fast track-switching
Giacomo Lozito <james@develia.org>
parents:
3259
diff
changeset
|
343 playback->set_pb_ready = playback_set_pb_ready; |
3253
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
344 |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
345 set_current_input_playback(playback); |
6374d66ee623
proper race condition fix
William Pitcock <nenolod@atheme-project.org>
parents:
3252
diff
changeset
|
346 |
3325
6f6f38157229
Fix the thread join issue.
William Pitcock <nenolod@atheme-project.org>
parents:
3319
diff
changeset
|
347 playback->thread = g_thread_create(playback_monitor_thread, playback, TRUE, NULL); |
2313 | 348 |
349 return TRUE; | |
350 } | |
351 | |
352 gboolean | |
353 playback_get_playing(void) | |
354 { | |
355 return ip_data.playing; | |
356 } | |
357 | |
358 gboolean | |
359 playback_get_paused(void) | |
360 { | |
361 return ip_data.paused; | |
362 } | |
363 | |
364 void | |
365 playback_seek(gint time) | |
366 { | |
3168
ee8a1ed30826
playback_seek(): several WTFs in here (probably from XMMS) fixed
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
367 InputPlayback *playback = get_current_input_playback(); |
2313 | 368 gboolean restore_pause = FALSE; |
369 gint l=0, r=0; | |
370 | |
2420 | 371 g_return_if_fail(ip_data.playing); |
3168
ee8a1ed30826
playback_seek(): several WTFs in here (probably from XMMS) fixed
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
372 g_return_if_fail(playback != NULL); |
2313 | 373 |
374 /* FIXME WORKAROUND...that should work with all plugins | |
375 * mute the volume, start playback again, do the seek, then pause again | |
376 * -Patrick Sudowe | |
377 */ | |
2420 | 378 if (ip_data.paused) |
2313 | 379 { |
2420 | 380 restore_pause = TRUE; |
381 output_get_volume(&l, &r); | |
382 output_set_volume(0,0); | |
383 playback_pause(); | |
2313 | 384 } |
385 | |
3168
ee8a1ed30826
playback_seek(): several WTFs in here (probably from XMMS) fixed
William Pitcock <nenolod@atheme-project.org>
parents:
3165
diff
changeset
|
386 playback->plugin->seek(playback, time); |
2313 | 387 free_vis_data(); |
388 | |
2420 | 389 if (restore_pause) |
2313 | 390 { |
2420 | 391 playback_pause(); |
392 output_set_volume(l, r); | |
2313 | 393 } |
394 } | |
395 | |
396 void | |
397 playback_seek_relative(gint offset) | |
398 { | |
399 gint time = CLAMP(playback_get_time() / 1000 + offset, | |
400 0, playlist_get_current_length(playlist_get_active()) / 1000 - 1); | |
401 playback_seek(time); | |
402 } |