Mercurial > audlegacy-plugins
annotate src/aosd/aosd_trigger.c @ 3030:c442f8407dcb
Show playlist popup information reliably (Debian bug #460802)
author | John Lindgren <john.lindgren@tds.net> |
---|---|
date | Fri, 10 Apr 2009 01:46:08 -0400 |
parents | 3134a0987162 |
children |
rev | line source |
---|---|
597 | 1 /* |
2 * | |
3 * Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007 | |
4 * | |
5 * This program is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License as published by the | |
7 * Free Software Foundation; either version 2 of the License, or (at your | |
8 * option) any later version. | |
9 * | |
10 * This program is distributed in the hope that it will be useful, but | |
11 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 * General Public License for more details. | |
14 * | |
15 * You should have received a copy of the GNU General Public License along | |
16 * with this program; if not, write to the Free Software Foundation, Inc., | |
17 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
18 * | |
19 */ | |
20 | |
21 #include "aosd_trigger.h" | |
22 #include "aosd_trigger_private.h" | |
23 #include "aosd_cfg.h" | |
2064
c8d55b929442
Just to hush down the warnings...
Eugene Paskevich <eugene@raptor.kiev.ua>
parents:
2060
diff
changeset
|
24 #include "aosd_osd.h" |
597 | 25 #include <glib.h> |
2971
3134a0987162
- changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
2576
diff
changeset
|
26 #include <audlegacy/i18n.h> |
3134a0987162
- changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
2576
diff
changeset
|
27 #include <audlegacy/playlist.h> |
3134a0987162
- changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
2576
diff
changeset
|
28 #include <audlegacy/hook.h> |
3134a0987162
- changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
2576
diff
changeset
|
29 #include <audlegacy/auddrct.h> |
597 | 30 |
31 | |
32 extern aosd_cfg_t * global_config; | |
33 | |
34 | |
35 /* trigger codes ( the code values do not need to be sequential ) */ | |
36 enum | |
37 { | |
38 AOSD_TRIGGER_PB_START = 0, | |
623 | 39 AOSD_TRIGGER_PB_TITLECHANGE = 1, |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
40 AOSD_TRIGGER_VOL_CHANGE = 2, |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
41 AOSD_TRIGGER_PB_PAUSEON = 3, |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
42 AOSD_TRIGGER_PB_PAUSEOFF = 4 |
597 | 43 }; |
44 | |
45 /* trigger codes array size */ | |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
46 #define AOSD_TRIGGER_CODES_ARRAY_SIZE 5 |
597 | 47 |
48 /* trigger codes array */ | |
49 gint aosd_trigger_codes[] = | |
50 { | |
51 AOSD_TRIGGER_PB_START, | |
623 | 52 AOSD_TRIGGER_PB_TITLECHANGE, |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
53 AOSD_TRIGGER_VOL_CHANGE, |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
54 AOSD_TRIGGER_PB_PAUSEON, |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
55 AOSD_TRIGGER_PB_PAUSEOFF |
597 | 56 }; |
57 | |
58 /* prototypes of trigger functions */ | |
59 static void aosd_trigger_func_pb_start_onoff ( gboolean ); | |
60 static void aosd_trigger_func_pb_start_cb ( gpointer , gpointer ); | |
623 | 61 static void aosd_trigger_func_pb_titlechange_onoff ( gboolean ); |
597 | 62 static void aosd_trigger_func_pb_titlechange_cb ( gpointer , gpointer ); |
623 | 63 static void aosd_trigger_func_vol_change_onoff ( gboolean ); |
64 static void aosd_trigger_func_vol_change_cb ( gpointer , gpointer ); | |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
65 static void aosd_trigger_func_pb_pauseon_onoff ( gboolean ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
66 static void aosd_trigger_func_pb_pauseon_cb ( gpointer , gpointer ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
67 static void aosd_trigger_func_pb_pauseoff_onoff ( gboolean ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
68 static void aosd_trigger_func_pb_pauseoff_cb ( gpointer , gpointer ); |
2288
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
69 static void aosd_trigger_func_hook_cb ( gpointer markup_text , gpointer unused ); |
597 | 70 |
71 /* map trigger codes to trigger objects */ | |
72 aosd_trigger_t aosd_triggers[] = | |
73 { | |
74 [AOSD_TRIGGER_PB_START] = { N_("Playback Start") , | |
75 N_("Triggers OSD when a playlist entry is played.") , | |
76 aosd_trigger_func_pb_start_onoff , | |
77 aosd_trigger_func_pb_start_cb }, | |
78 | |
79 [AOSD_TRIGGER_PB_TITLECHANGE] = { N_("Title Change") , | |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
80 N_("Triggers OSD when, during playback, the song title changes " |
597 | 81 "but the filename is the same. This is mostly useful to display " |
82 "title changes in internet streams.") , | |
623 | 83 aosd_trigger_func_pb_titlechange_onoff , |
84 aosd_trigger_func_pb_titlechange_cb }, | |
85 | |
86 [AOSD_TRIGGER_VOL_CHANGE] = { N_("Volume Change") , | |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
87 N_("Triggers OSD when volume is changed.") , |
623 | 88 aosd_trigger_func_vol_change_onoff , |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
89 aosd_trigger_func_vol_change_cb }, |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
90 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
91 [AOSD_TRIGGER_PB_PAUSEON] = { N_("Pause On") , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
92 N_("Triggers OSD when playback is paused.") , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
93 aosd_trigger_func_pb_pauseon_onoff , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
94 aosd_trigger_func_pb_pauseon_cb }, |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
95 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
96 [AOSD_TRIGGER_PB_PAUSEOFF] = { N_("Pause Off") , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
97 N_("Triggers OSD when playback is unpaused.") , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
98 aosd_trigger_func_pb_pauseoff_onoff , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
99 aosd_trigger_func_pb_pauseoff_cb } |
597 | 100 }; |
101 | |
102 | |
103 | |
104 /* TRIGGER API */ | |
105 | |
106 void | |
107 aosd_trigger_get_codes_array ( gint ** array , gint * array_size ) | |
108 { | |
109 *array = aosd_trigger_codes; | |
110 *array_size = AOSD_TRIGGER_CODES_ARRAY_SIZE; | |
111 return; | |
112 } | |
113 | |
114 | |
115 const gchar * | |
116 aosd_trigger_get_name ( gint trig_code ) | |
117 { | |
118 return aosd_triggers[trig_code].name; | |
119 } | |
120 | |
121 | |
122 const gchar * | |
123 aosd_trigger_get_desc ( gint trig_code ) | |
124 { | |
125 return aosd_triggers[trig_code].desc; | |
126 } | |
127 | |
128 | |
129 void | |
130 aosd_trigger_start ( aosd_cfg_osd_trigger_t * cfg_trigger ) | |
131 { | |
132 gint i = 0; | |
133 for ( i = 0 ; i < cfg_trigger->active->len ; i++ ) | |
134 { | |
135 gint trig_code = g_array_index( cfg_trigger->active , gint , i ); | |
136 aosd_triggers[trig_code].onoff_func( TRUE ); | |
137 } | |
2288
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
138 /* When called, this hook will display the text of the user pointer |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
139 or the current playing song, if NULL */ |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
140 aud_hook_register("aosd toggle"); |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
141 aud_hook_associate( "aosd toggle" , aosd_trigger_func_hook_cb , NULL ); |
597 | 142 return; |
143 } | |
144 | |
145 | |
146 void | |
147 aosd_trigger_stop ( aosd_cfg_osd_trigger_t * cfg_trigger ) | |
148 { | |
149 gint i = 0; | |
2288
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
150 aud_hook_dissociate( "aosd toggle" , aosd_trigger_func_hook_cb ); |
597 | 151 for ( i = 0 ; i < cfg_trigger->active->len ; i++ ) |
152 { | |
153 gint trig_code = g_array_index( cfg_trigger->active , gint , i ); | |
154 aosd_triggers[trig_code].onoff_func( FALSE ); | |
155 } | |
156 return; | |
157 } | |
158 | |
159 | |
893
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
160 /* HELPER FUNCTIONS */ |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
161 |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
162 static gchar * |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
163 aosd_trigger_utf8convert ( gchar * str ) |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
164 { |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
165 if ( global_config->osd->text.utf8conv_disable == FALSE ) |
2050
2ffc6a69fcd1
string API calls -> vtable
William Pitcock <nenolod@atheme.org>
parents:
1238
diff
changeset
|
166 return aud_str_to_utf8( str ); |
893
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
167 else |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
168 return g_strdup( str ); |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
169 } |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
170 |
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
171 |
597 | 172 /* TRIGGER FUNCTIONS */ |
173 | |
174 static void | |
175 aosd_trigger_func_pb_start_onoff ( gboolean turn_on ) | |
176 { | |
177 if ( turn_on == TRUE ) | |
2060 | 178 aud_hook_associate( "playback begin" , aosd_trigger_func_pb_start_cb , NULL ); |
597 | 179 else |
2060 | 180 aud_hook_dissociate( "playback begin" , aosd_trigger_func_pb_start_cb ); |
597 | 181 return; |
182 } | |
183 | |
184 static void | |
185 aosd_trigger_func_pb_start_cb ( gpointer plentry_gp , gpointer unused ) | |
186 { | |
187 PlaylistEntry *pl_entry = plentry_gp; | |
598
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
188 if ( plentry_gp != NULL ) |
597 | 189 { |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
190 gchar *title, *utf8_title; |
598
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
191 if ( pl_entry->title != NULL ) |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
192 { |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
193 /* if there is a proper title, use it */ |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
194 title = g_strdup(pl_entry->title); |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
195 } |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
196 else |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
197 { |
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
198 /* pick what we have as song title */ |
2057
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
199 Playlist *active = aud_playlist_get_active(); |
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
200 gint pos = aud_playlist_get_position(active); |
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
201 title = aud_playlist_get_songtitle(active, pos); |
598
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
202 } |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
203 utf8_title = aosd_trigger_utf8convert( title ); |
766
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
204 if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE ) |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
205 { |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
206 gchar *utf8_title_markup = g_markup_printf_escaped( |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
207 "<span font_desc='%s'>%s</span>" , global_config->osd->text.fonts_name[0] , utf8_title ); |
883
e6d51d079a46
[svn] - aosd: use a single ghosd object for all of the osd showups; this will be a lot gentler to XLib and should definitely help with stability
giacomo
parents:
787
diff
changeset
|
208 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE ); |
766
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
209 g_free( utf8_title_markup ); |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
210 } |
597 | 211 g_free( utf8_title ); |
598
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
212 g_free( title ); |
597 | 213 } |
214 return; | |
215 } | |
216 | |
217 | |
218 | |
219 typedef struct | |
220 { | |
221 gchar *title; | |
222 gchar *filename; | |
223 } | |
224 aosd_pb_titlechange_prevs_t; | |
225 | |
226 | |
227 static void | |
623 | 228 aosd_trigger_func_pb_titlechange_onoff ( gboolean turn_on ) |
597 | 229 { |
230 static aosd_pb_titlechange_prevs_t *prevs = NULL; | |
231 | |
232 if ( turn_on == TRUE ) | |
233 { | |
234 prevs = g_malloc0(sizeof(aosd_pb_titlechange_prevs_t)); | |
235 prevs->title = NULL; | |
236 prevs->filename = NULL; | |
2060 | 237 aud_hook_associate( "playlist set info" , aosd_trigger_func_pb_titlechange_cb , prevs ); |
597 | 238 } |
239 else | |
240 { | |
2060 | 241 aud_hook_dissociate( "playlist set info" , aosd_trigger_func_pb_titlechange_cb ); |
597 | 242 if ( prevs != NULL ) |
243 { | |
244 if ( prevs->title != NULL ) g_free( prevs->title ); | |
245 if ( prevs->filename != NULL ) g_free( prevs->filename ); | |
246 g_free( prevs ); | |
247 prevs = NULL; | |
248 } | |
249 } | |
250 return; | |
251 } | |
252 | |
253 static void | |
254 aosd_trigger_func_pb_titlechange_cb ( gpointer plentry_gp , gpointer prevs_gp ) | |
255 { | |
2058
fffa7e3d39e0
use aud_ip_state (replacement to ip_data).
William Pitcock <nenolod@atheme.org>
parents:
2057
diff
changeset
|
256 if ( aud_ip_state->playing ) |
597 | 257 { |
258 aosd_pb_titlechange_prevs_t *prevs = prevs_gp; | |
259 PlaylistEntry *pl_entry = plentry_gp; | |
260 | |
261 /* same filename but title changed, useful to detect http stream song changes */ | |
262 | |
263 if ( ( prevs->title != NULL ) && ( prevs->filename != NULL ) ) | |
264 { | |
598
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
265 if ( ( pl_entry->filename != NULL ) && ( !strcmp(pl_entry->filename,prevs->filename) ) ) |
597 | 266 { |
598
e83e6fb3ebfa
[svn] - aosd: stability fixes for triggers (handle situation where a plentry exists but plentry->title is null)
giacomo
parents:
597
diff
changeset
|
267 if ( ( pl_entry->title != NULL ) && ( strcmp(pl_entry->title,prevs->title) ) ) |
597 | 268 { |
269 /* string formatting is done here a.t.m. - TODO - improve this area */ | |
893
ca9907354db6
[svn] - aosd: added an option to enable/disable utf8 text conversion done by the plugin
giacomo
parents:
890
diff
changeset
|
270 gchar *utf8_title = aosd_trigger_utf8convert( pl_entry->title ); |
766
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
271 if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE ) |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
272 { |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
273 gchar *utf8_title_markup = g_markup_printf_escaped( |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
274 "<span font_desc='%s'>%s</span>" , global_config->osd->text.fonts_name[0] , utf8_title ); |
883
e6d51d079a46
[svn] - aosd: use a single ghosd object for all of the osd showups; this will be a lot gentler to XLib and should definitely help with stability
giacomo
parents:
787
diff
changeset
|
275 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE ); |
766
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
276 g_free( utf8_title_markup ); |
53f63f43663f
[svn] - extra check with g_utf8_validate to avoid the osd crash when a non-utf8 string survives the str_to_utf8 conversion
giacomo
parents:
746
diff
changeset
|
277 } |
597 | 278 g_free( utf8_title ); |
279 g_free( prevs->title ); | |
280 prevs->title = g_strdup(pl_entry->title); | |
281 } | |
282 } | |
283 else | |
284 { | |
285 g_free(prevs->filename); | |
286 prevs->filename = g_strdup(pl_entry->filename); | |
609
9b73eb35f4ff
[svn] - aosd: avoid collision between playback start trigger and titlechange trigger, that occurred when the next file in playlist was played
giacomo
parents:
598
diff
changeset
|
287 /* if filename changes, reset title as well */ |
9b73eb35f4ff
[svn] - aosd: avoid collision between playback start trigger and titlechange trigger, that occurred when the next file in playlist was played
giacomo
parents:
598
diff
changeset
|
288 if ( prevs->title != NULL ) |
9b73eb35f4ff
[svn] - aosd: avoid collision between playback start trigger and titlechange trigger, that occurred when the next file in playlist was played
giacomo
parents:
598
diff
changeset
|
289 g_free(prevs->title); |
9b73eb35f4ff
[svn] - aosd: avoid collision between playback start trigger and titlechange trigger, that occurred when the next file in playlist was played
giacomo
parents:
598
diff
changeset
|
290 prevs->title = g_strdup(pl_entry->title); |
597 | 291 } |
292 } | |
293 else | |
294 { | |
295 if ( prevs->title != NULL ) | |
296 g_free(prevs->title); | |
297 prevs->title = g_strdup(pl_entry->title); | |
298 if ( prevs->filename != NULL ) | |
299 g_free(prevs->filename); | |
300 prevs->filename = g_strdup(pl_entry->filename); | |
301 } | |
302 } | |
303 } | |
623 | 304 |
305 | |
306 static void | |
307 aosd_trigger_func_vol_change_onoff ( gboolean turn_on ) | |
308 { | |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
309 if ( turn_on == TRUE ) |
2060 | 310 aud_hook_associate( "volume set" , aosd_trigger_func_vol_change_cb , NULL ); |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
311 else |
2060 | 312 aud_hook_dissociate( "volume set" , aosd_trigger_func_vol_change_cb ); |
623 | 313 return; |
314 } | |
315 | |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
316 typedef struct |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
317 { |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
318 gint h_vol[2]; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
319 gint sid; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
320 } |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
321 aosd_vol_change_bucket_t; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
322 |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
323 static gboolean |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
324 aosd_trigger_func_vol_change_timeout ( gpointer bucket_gp ) |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
325 { |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
326 aosd_vol_change_bucket_t *bucket = bucket_gp; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
327 gchar *utf8_title_markup = g_markup_printf_escaped( |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
328 "<span font_desc='%s'>Volume Change - L: %i , R: %i</span>" , |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
329 global_config->osd->text.fonts_name[0] , bucket->h_vol[0] , bucket->h_vol[1] ); |
883
e6d51d079a46
[svn] - aosd: use a single ghosd object for all of the osd showups; this will be a lot gentler to XLib and should definitely help with stability
giacomo
parents:
787
diff
changeset
|
330 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE ); |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
331 g_free( utf8_title_markup ); |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
332 bucket->sid = 0; /* reset source id value */ |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
333 return FALSE; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
334 } |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
335 |
623 | 336 static void |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
337 aosd_trigger_func_vol_change_cb ( gpointer h_vol_gp , gpointer unused ) |
623 | 338 { |
637
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
339 gint *h_vol = h_vol_gp; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
340 static aosd_vol_change_bucket_t bucket = { { 0 , 0 } , 0 }; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
341 |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
342 bucket.h_vol[0] = h_vol[0]; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
343 bucket.h_vol[1] = h_vol[1]; |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
344 |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
345 /* in order to avoid repeated display of osd for each volume variation, use a |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
346 timer to prevent it from appearing more than once when multiple volume |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
347 changes are performed in a short time interval (500 msec) */ |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
348 if ( bucket.sid == 0 ) |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
349 { |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
350 /* first call in the time interval */ |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
351 bucket.sid = g_timeout_add( 500 , aosd_trigger_func_vol_change_timeout , &bucket ); |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
352 } |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
353 else |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
354 { |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
355 /* another call in the same interval, reset the interval */ |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
356 g_source_remove( bucket.sid ); |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
357 bucket.sid = g_timeout_add( 500 , aosd_trigger_func_vol_change_timeout , &bucket ); |
a1687bd302ce
[svn] - aosd: completed volume change trigger, works now
giacomo
parents:
623
diff
changeset
|
358 } |
623 | 359 return; |
360 } | |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
361 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
362 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
363 static void |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
364 aosd_trigger_func_pb_pauseon_onoff ( gboolean turn_on ) |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
365 { |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
366 if ( turn_on == TRUE ) |
2060 | 367 aud_hook_associate( "playback pause" , aosd_trigger_func_pb_pauseon_cb , NULL ); |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
368 else |
2060 | 369 aud_hook_dissociate( "playback pause" , aosd_trigger_func_pb_pauseon_cb ); |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
370 return; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
371 } |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
372 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
373 static void |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
374 aosd_trigger_func_pb_pauseon_cb ( gpointer unused1 , gpointer unused2 ) |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
375 { |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
376 gchar *utf8_title_markup = g_markup_printf_escaped( |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
377 "<span font_desc='%s'>Paused</span>" , global_config->osd->text.fonts_name[0] ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
378 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
379 g_free( utf8_title_markup ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
380 return; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
381 } |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
382 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
383 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
384 static void |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
385 aosd_trigger_func_pb_pauseoff_onoff ( gboolean turn_on ) |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
386 { |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
387 if ( turn_on == TRUE ) |
2060 | 388 aud_hook_associate( "playback unpause" , aosd_trigger_func_pb_pauseoff_cb , NULL ); |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
389 else |
2060 | 390 aud_hook_dissociate( "playback unpause" , aosd_trigger_func_pb_pauseoff_cb ); |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
391 return; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
392 } |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
393 |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
394 static void |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
395 aosd_trigger_func_pb_pauseoff_cb ( gpointer unused1 , gpointer unused2 ) |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
396 { |
2057
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
397 Playlist *active = aud_playlist_get_active(); |
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
398 gint pos = aud_playlist_get_position(active); |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
399 gchar *title, *utf8_title, *utf8_title_markup; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
400 gint time_cur, time_tot; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
401 gint time_cur_m, time_cur_s, time_tot_m, time_tot_s; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
402 |
2057
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
403 time_tot = aud_playlist_get_songtime(active, pos) / 1000; |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
404 time_cur = audacious_drct_get_time() / 1000; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
405 time_cur_s = time_cur % 60; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
406 time_cur_m = (time_cur - time_cur_s) / 60; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
407 time_tot_s = time_tot % 60; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
408 time_tot_m = (time_tot - time_tot_s) / 60; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
409 |
2057
cf4fa45ffd80
playlist API vtabling
William Pitcock <nenolod@atheme.org>
parents:
2050
diff
changeset
|
410 title = aud_playlist_get_songtitle(active, pos); |
1238
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
411 utf8_title = aosd_trigger_utf8convert( title ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
412 utf8_title_markup = g_markup_printf_escaped( |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
413 "<span font_desc='%s'>%s (%i:%02i/%i:%02i)</span>" , |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
414 global_config->osd->text.fonts_name[0] , utf8_title , time_cur_m , time_cur_s , time_tot_m , time_tot_s ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
415 aosd_osd_display( utf8_title_markup , global_config->osd , FALSE ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
416 g_free( utf8_title_markup ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
417 g_free( utf8_title ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
418 g_free( title ); |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
419 return; |
5d9fb703a7cc
aosd: added triggers for pause and unpause event
Giacomo Lozito <james@develia.org>
parents:
893
diff
changeset
|
420 } |
2288
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
421 |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
422 |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
423 /* Call with aud_hook_call("aosd toggle", param); |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
424 If param != NULL, display the supplied text in the OSD |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
425 If param == NULL, display the current playing song */ |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
426 static void |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
427 aosd_trigger_func_hook_cb ( gpointer markup_text , gpointer unused ) |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
428 { |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
429 if ( markup_text != NULL ) |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
430 { |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
431 /* Display text from caller */ |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
432 aosd_osd_display( markup_text , global_config->osd , FALSE ); |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
433 } else { |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
434 /* Display currently playing song */ |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
435 Playlist* pl; |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
436 PlaylistEntry *pl_entry; |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
437 |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
438 pl = aud_playlist_get_active(); |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
439 if (pl == NULL) return; |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
440 pl_entry = aud_playlist_get_entry_to_play(pl); |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
441 aosd_trigger_func_pb_start_cb ( (void*)pl_entry, NULL ); |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
442 } |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
443 return; |
5a925593d754
Audacious OSD Plugin: Added trigger "aosd toggle" to trigger display of OSD from other plugins
Sascha Hlusiak <contact@saschahlusiak.de>
parents:
2064
diff
changeset
|
444 } |