annotate src/audacious/playback.c @ 3089:f40b8491a812

Remove genevent, seperate playback logic into seperate control thread. This still has bugs, so watch out.
author William Pitcock <nenolod@atheme-project.org>
date Mon, 16 Jul 2007 15:50:32 -0500
parents 20830a69b5f5
children 29d3abbbe0a2 1ddeb9f068ab
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
1 /* Audacious - Cross-platform multimedia player
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
2 * Copyright (C) 2005-2007 Audacious development team
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
3 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
4 * Based on BMP:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
5 * Copyright (C) 2003-2004 BMP development team.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
6 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
7 * Based on XMMS:
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
8 * Copyright (C) 1998-2003 XMMS development team.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
9 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
10 * This program is free software; you can redistribute it and/or modify
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
11 * it under the terms of the GNU General Public License as published by
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
12 * the Free Software Foundation; under version 2 of the License.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
13 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
14 * This program is distributed in the hope that it will be useful,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
17 * GNU General Public License for more details.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
18 *
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
19 * You should have received a copy of the GNU General Public License
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
20 * along with this program; if not, write to the Free Software
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
22 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
23
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
24 #ifdef HAVE_CONFIG_H
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
25 # include "config.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
26 #endif
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
27
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
28 #include <glib.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
29 #include <glib/gi18n.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
30 #include <glib/gprintf.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
31 #include <stdlib.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
32 #include <string.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
33 #include <time.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
34
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
35 #include <unistd.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
36 #include <sys/types.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
37 #include <sys/stat.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
38 #include <dirent.h>
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
39
2717
6884a2144a01 [svn] - make audacious build again
nenolod
parents: 2663
diff changeset
40 #include "configdb.h"
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
41
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
42 #include "hook.h"
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
43 #include "input.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
44 #include "main.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
45 #include "ui_equalizer.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
46 #include "output.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
47 #include "playlist.h"
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
48 #include "ui_main.h"
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
49 #include "ui_playlist.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
50 #include "ui_skinselector.h"
3072
84de3244aeaa replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents: 3054
diff changeset
51 #include "ui_skinned_playstatus.h"
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
52 #include "util.h"
3082
91df04ec5ef7 From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents: 3042
diff changeset
53 #include "visualization.h"
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
54
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
55 #include "playback.h"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
56
3018
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
57 static int song_info_timeout_source = 0;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
58
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
59 gint
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
60 playback_get_time(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
61 {
2438
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
62 InputPlayback *playback;
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
63 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
64 playback = get_current_input_playback();
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
65 g_return_val_if_fail(playback, -1);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
66
2438
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
67 if (playback->plugin->get_time)
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
68 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
69 if (playback->error)
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
70 return -2;
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
71 if (!playback->playing ||
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
72 (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
73 return -1;
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
74 return playback->output->output_time();
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
75 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
76
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
77 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
78 playback_initiate(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
79 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
80 PlaylistEntry *entry = NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
81 Playlist *playlist = playlist_get_active();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
82
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
83 g_return_if_fail(playlist_get_length(playlist) != 0);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
84
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
85 if (playback_get_playing())
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
86 playback_stop();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
87
3020
6065d70cb790 replace old Vis with UiVis
Tomasz Mon <desowin@gmail.com>
parents: 3001
diff changeset
88 ui_vis_clear_data(mainwin_vis);
3054
34f37c59e87b replace svis with UiSVis
Tomasz Mon <desowin@gmail.com>
parents: 3042
diff changeset
89 ui_svis_clear_data(mainwin_svis);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
90 mainwin_disable_seekbar();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
91
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
92 entry = playlist_get_entry_to_play(playlist);
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
93 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
94 playback_play_file(entry);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
95
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
96 if (playback_get_time() != -1) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
97 equalizerwin_load_auto_preset(entry->filename);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
98 input_set_eq(cfg.equalizer_active, cfg.equalizer_preamp,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
99 cfg.equalizer_bands);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
100 output_set_eq(cfg.equalizer_active, cfg.equalizer_preamp,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
101 cfg.equalizer_bands);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
102 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
103
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
104 playlist_check_pos_current(playlist);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
105 mainwin_set_info_text();
3018
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
106 mainwin_update_song_info();
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
107
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
108 /* 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
109 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
110 (GSourceFunc) mainwin_update_song_info, NULL);
2407
1dc1d36d0347 [svn] - add hooks: playback begin, playback end, playlist reached end
nenolod
parents: 2366
diff changeset
111
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
112 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
113 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
114 gtk_widget_show(mainwin_stime_sec);
3042
01ae56759d15 mainwin_sposition is now UiSkinnedHorizontalSlider
Tomasz Mon <desowin@gmail.com>
parents: 3041
diff changeset
115 gtk_widget_show(mainwin_sposition);
3001
6d4b7b739232 fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents: 3000
diff changeset
116 } else {
6d4b7b739232 fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents: 3000
diff changeset
117 gtk_widget_show(mainwin_minus_num);
6d4b7b739232 fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents: 3000
diff changeset
118 gtk_widget_show(mainwin_10min_num);
6d4b7b739232 fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents: 3000
diff changeset
119 gtk_widget_show(mainwin_min_num);
6d4b7b739232 fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents: 3000
diff changeset
120 gtk_widget_show(mainwin_10sec_num);
6d4b7b739232 fully implement UiSkinnedNumber, number.c no longer needed
Tomasz Mon <desowin@gmail.com>
parents: 3000
diff changeset
121 gtk_widget_show(mainwin_sec_num);
3040
067e0186623a import UiSkinnedHorizontalSlider
Tomasz Mon <desowin@gmail.com>
parents: 3021
diff changeset
122 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
123 }
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
124
3082
91df04ec5ef7 From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents: 3042
diff changeset
125 vis_playback_start();
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
126 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
127
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
128 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
129 playback_pause(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
130 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
131 if (!playback_get_playing())
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
132 return;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
133
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
134 if (!get_current_input_playback())
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
135 return;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
136
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
137 ip_data.paused = !ip_data.paused;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
138
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
139 if (get_current_input_playback()->plugin->pause)
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
140 get_current_input_playback()->plugin->pause(get_current_input_playback(),
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
141 ip_data.paused);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
142
3039
c981df78db8c added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents: 3021
diff changeset
143 if (ip_data.paused)
c981df78db8c added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents: 3021
diff changeset
144 hook_call("playback pause", NULL);
c981df78db8c added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents: 3021
diff changeset
145 else
c981df78db8c added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents: 3021
diff changeset
146 hook_call("playback unpause", NULL);
c981df78db8c added hooks: playback pause and playback unpause
Giacomo Lozito <james@develia.org>
parents: 3021
diff changeset
147
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
148 g_return_if_fail(mainwin_playstatus != NULL);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
149
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
150 if (ip_data.paused)
3072
84de3244aeaa replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents: 3054
diff changeset
151 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PAUSE);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
152 else
3072
84de3244aeaa replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents: 3054
diff changeset
153 ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
154 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
155
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
156 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
157 playback_stop(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
158 {
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
159 InputPlayback *playback = get_current_input_playback();
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
160
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
161 if (ip_data.playing && playback != NULL)
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
162 {
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
163 if (playback_get_paused())
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
164 {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
165 output_flush(get_written_time()); /* to avoid noise */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
166 playback_pause();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
167 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
168
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
169 ip_data.playing = FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
170
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
171 if (playback->plugin->stop)
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
172 playback->plugin->stop(playback);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
173
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
174 free_vis_data();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
175 ip_data.paused = FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
176
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
177 if (input_info_text != NULL)
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
178 {
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
179 g_free(input_info_text);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
180 input_info_text = NULL;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
181 mainwin_set_info_text();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
182 }
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
183
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
184 g_cond_signal(playback->playback_cond);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
185 g_thread_join(playback->playback_control);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
186 g_cond_free(playback->playback_cond);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
187 g_mutex_free(playback->playback_mutex);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
188
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
189 g_free(playback->filename);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
190 g_free(playback);
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
191 set_current_input_playback(NULL);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
192 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
193
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
194 ip_data.buffering = FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
195 ip_data.playing = FALSE;
3018
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
196
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
197 if (song_info_timeout_source)
6a9fdd5aee3a Move timer updates out of the 100hz giant loop.
Daniel Drake <dsd@gentoo.org>
parents: 3001
diff changeset
198 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
199
3082
91df04ec5ef7 From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents: 3042
diff changeset
200 vis_playback_stop();
91df04ec5ef7 From: Daniel Drake <dsd@gentoo.org>
William Pitcock <nenolod@atheme-project.org>
parents: 3042
diff changeset
201
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
202 g_return_if_fail(mainwin_playstatus != NULL);
3072
84de3244aeaa replace Playstatus with UiSkinnedPlaystatus
Tomasz Mon <desowin@gmail.com>
parents: 3054
diff changeset
203 ui_skinned_playstatus_set_buffering(mainwin_playstatus, FALSE);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
204 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
205
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
206 static void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
207 run_no_output_plugin_dialog(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
208 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
209 const gchar *markup =
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
210 N_("<b><big>No output plugin selected.</big></b>\n"
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
211 "You have not selected an output plugin.");
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
212
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
213 GtkWidget *dialog =
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
214 gtk_message_dialog_new_with_markup(GTK_WINDOW(mainwin),
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
215 GTK_DIALOG_DESTROY_WITH_PARENT,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
216 GTK_MESSAGE_ERROR,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
217 GTK_BUTTONS_OK,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
218 _(markup));
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
219 gtk_dialog_run(GTK_DIALOG(dialog));
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
220 gtk_widget_destroy(dialog);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
221 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
222
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
223 static gpointer
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
224 playback_control_thread(gpointer data)
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
225 {
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
226 InputPlayback *playback = (InputPlayback *) data;
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
227 g_return_val_if_fail(playback != NULL, NULL);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
228
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
229 ip_data.playing = TRUE;
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
230
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
231 playback->plugin->play_file(playback);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
232
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
233 hook_call("playback begin", playback->entry);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
234
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
235 while (ip_data.playing == TRUE && playback->eof == FALSE && playback->playing == TRUE)
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
236 {
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
237 GTimeVal tmwait;
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
238 g_get_current_time(&tmwait);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
239 g_time_val_add(&tmwait, 1000000);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
240 g_cond_timed_wait(playback->playback_cond, playback->playback_mutex, &tmwait);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
241 }
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
242
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
243 ip_data.playing = FALSE;
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
244
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
245 hook_call("playback end", playback->entry);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
246
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
247 return NULL;
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
248 }
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
249
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
250 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
251 playback_play_file(PlaylistEntry *entry)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
252 {
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
253 InputPlayback *playback;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
254 g_return_val_if_fail(entry != NULL, FALSE);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
255
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
256 if (!get_current_output_plugin()) {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
257 run_no_output_plugin_dialog();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
258 mainwin_stop_pushed();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
259 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
260 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
261
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
262 if (cfg.random_skin_on_play)
2443
93686e8815a4 [svn] - Changed playback_set_random_skin() to skin_set_random_skin()
mf0102
parents: 2438
diff changeset
263 skin_set_random_skin();
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
264
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
265 /*
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
266 * This is slightly uglier than the original version, but should
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
267 * fix the "crash" issues as seen in 0.2 when dealing with this situation.
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
268 * - nenolod
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
269 */
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
270 if (!entry->decoder &&
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
271 (((entry->decoder = input_check_file(entry->filename, FALSE)) == NULL) ||
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
272 !input_is_enabled(entry->decoder->filename)))
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
273 {
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
274 set_current_input_playback(NULL);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
275 mainwin_set_info_text();
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
276
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
277 return FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
278 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
279
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
280 playback = g_new0(InputPlayback, 1);
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
281
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
282 set_current_input_playback(playback);
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
283
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
284 playback->plugin = entry->decoder;
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
285 playback->output = &psuedo_output_plugin;
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
286 playback->plugin->output = playback->output;
2438
8750a62abed8 [svn] Provide flags in InputPlayback for common plugin flag needs, and provide a
iabervon
parents: 2436
diff changeset
287 playback->filename = g_strdup(entry->filename);
3089
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
288 playback->playback_mutex = g_mutex_new();
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
289 playback->playback_cond = g_cond_new();
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
290 playback->playback_control = g_thread_create(playback_control_thread, playback, TRUE, NULL);
f40b8491a812 Remove genevent, seperate playback logic into seperate control thread.
William Pitcock <nenolod@atheme-project.org>
parents: 3084
diff changeset
291 playback->entry = entry;
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
292
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
293 return TRUE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
294 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
295
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
296 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
297 playback_get_playing(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
298 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
299 return ip_data.playing;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
300 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
301
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
302 gboolean
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
303 playback_get_paused(void)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
304 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
305 return ip_data.paused;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
306 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
307
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
308 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
309 playback_seek(gint time)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
310 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
311 gboolean restore_pause = FALSE;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
312 gint l=0, r=0;
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
313
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
314 g_return_if_fail(ip_data.playing);
2436
f346d30bf5ab [svn] Change the input plugin API to use a struct for the currently-playing file.
iabervon
parents: 2420
diff changeset
315 g_return_if_fail(get_current_input_playback());
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
316
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
317 /* FIXME WORKAROUND...that should work with all plugins
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
318 * mute the volume, start playback again, do the seek, then pause again
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
319 * -Patrick Sudowe
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
320 */
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
321 if (ip_data.paused)
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
322 {
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
323 restore_pause = TRUE;
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
324 output_get_volume(&l, &r);
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
325 output_set_volume(0,0);
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
326 playback_pause();
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
327 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
328
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
329 free_vis_data();
2454
aa60c92e7491 [svn] - forgot something kinda important
nenolod
parents: 2453
diff changeset
330 get_current_input_playback()->plugin->seek(get_current_input_playback(), time);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
331
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
332 if (restore_pause)
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
333 {
2420
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
334 playback_pause();
b23f52fe132f [svn] Removed util.* from libaudacious
mf0102
parents: 2416
diff changeset
335 output_set_volume(l, r);
2313
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
336 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
337 }
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
338
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
339 void
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
340 playback_seek_relative(gint offset)
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
341 {
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
342 gint time = CLAMP(playback_get_time() / 1000 + offset,
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
343 0, playlist_get_current_length(playlist_get_active()) / 1000 - 1);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
344 playback_seek(time);
3149d4b1a9a9 [svn] - objective-make autodepend fixes
nenolod
parents:
diff changeset
345 }