comparison src/audacious/ui_playlist.c @ 2363:d9208536e270 trunk

[svn] reformatting and g_return_if_fail()
author mf0102
date Thu, 18 Jan 2007 13:21:57 -0800
parents 4b2c7d9523e7
children ad1d7687814c
comparison
equal deleted inserted replaced
2362:424bc51df918 2363:d9208536e270
251 251
252 void 252 void
253 playlistwin_update_list(Playlist *playlist) 253 playlistwin_update_list(Playlist *playlist)
254 { 254 {
255 /* this can happen early on. just bail gracefully. */ 255 /* this can happen early on. just bail gracefully. */
256 if (playlistwin_list == NULL) 256 g_return_if_fail(playlistwin_list);
257 return;
258 257
259 widget_draw(WIDGET(playlistwin_list)); 258 widget_draw(WIDGET(playlistwin_list));
260 widget_draw(WIDGET(playlistwin_slider)); 259 widget_draw(WIDGET(playlistwin_slider));
261 playlistwin_update_info(playlist); 260 playlistwin_update_info(playlist);
262 playlistwin_update_sinfo(playlist); 261 playlistwin_update_sinfo(playlist);
263 } 262 }
264
265 #if 0
266 static void
267 playlistwin_redraw_list(void)
268 {
269 g_return_if_fail(playlistwin_list != NULL);
270
271 draw_widget(playlistwin_list);
272 draw_widget(playlistwin_slider);
273 }
274 #endif
275 263
276 static void 264 static void
277 playlistwin_set_mask(void) 265 playlistwin_set_mask(void)
278 { 266 {
279 GdkGC *gc; 267 GdkGC *gc;
326 void 314 void
327 playlistwin_set_sinfo_font(gchar *font) 315 playlistwin_set_sinfo_font(gchar *font)
328 { 316 {
329 gchar *tmp = NULL, *tmp2 = NULL; 317 gchar *tmp = NULL, *tmp2 = NULL;
330 318
331 if(!font) 319 g_return_if_fail(font);
332 return;
333 320
334 tmp = g_strdup(font); 321 tmp = g_strdup(font);
335 if(!tmp) 322 g_return_if_fail(tmp);
336 return;
337 323
338 *strrchr(tmp, ' ') = '\0'; 324 *strrchr(tmp, ' ') = '\0';
339 tmp2 = g_strdup_printf("%s 8", tmp); 325 tmp2 = g_strdup_printf("%s 8", tmp);
340 if(!tmp2) 326 g_return_if_fail(tmp2);
341 return; 327
342 textbox_set_xfont(playlistwin_sinfo, cfg.mainwin_use_xfont, tmp2); 328 textbox_set_xfont(playlistwin_sinfo, cfg.mainwin_use_xfont, tmp2);
343 329
344 g_free(tmp); g_free(tmp2); 330 g_free(tmp);
331 g_free(tmp2);
345 } 332 }
346 333
347 void 334 void
348 playlistwin_set_sinfo_scroll(gboolean scroll) 335 playlistwin_set_sinfo_scroll(gboolean scroll)
349 { 336 {
729 playlistwin_show_filebrowser(void) 716 playlistwin_show_filebrowser(void)
730 { 717 {
731 util_run_filebrowser(NO_PLAY_BUTTON); 718 util_run_filebrowser(NO_PLAY_BUTTON);
732 } 719 }
733 720
734 #if 0
735 static void
736 playlistwin_add_dir_handler(const gchar * dir)
737 {
738 g_free(cfg.filesel_path);
739 cfg.filesel_path = g_strdup(dir);
740 playlist_add_dir(dir);
741 }
742 #endif
743
744 static void 721 static void
745 playlistwin_fileinfo(void) 722 playlistwin_fileinfo(void)
746 { 723 {
747 Playlist *playlist = playlist_get_active(); 724 Playlist *playlist = playlist_get_active();
748 725
756 else 733 else
757 playlist_fileinfo_current(playlist); 734 playlist_fileinfo_current(playlist);
758 } 735 }
759 736
760 static void 737 static void
761 show_playlist_save_error(GtkWindow * parent, 738 show_playlist_save_error(GtkWindow *parent,
762 const gchar * filename) 739 const gchar *filename)
763 { 740 {
764 GtkWidget *dialog; 741 GtkWidget *dialog;
765 742
766 g_return_if_fail(GTK_IS_WINDOW(parent)); 743 g_return_if_fail(GTK_IS_WINDOW(parent));
767 g_return_if_fail(filename != NULL); 744 g_return_if_fail(filename);
768 745
769 dialog = gtk_message_dialog_new(GTK_WINDOW(parent), 746 dialog = gtk_message_dialog_new(GTK_WINDOW(parent),
770 GTK_DIALOG_DESTROY_WITH_PARENT, 747 GTK_DIALOG_DESTROY_WITH_PARENT,
771 GTK_MESSAGE_ERROR, 748 GTK_MESSAGE_ERROR,
772 GTK_BUTTONS_OK, 749 GTK_BUTTONS_OK,
843 return; 820 return;
844 821
845 if (!playlist_save(playlist_get_active(), filename)) 822 if (!playlist_save(playlist_get_active(), filename))
846 show_playlist_save_error(GTK_WINDOW(playlistwin), filename); 823 show_playlist_save_error(GTK_WINDOW(playlistwin), filename);
847 } 824 }
848
849 #if 0
850 static void
851 playlistwin_save_current(void)
852 {
853 const gchar *filename;
854
855 if (!(filename = playlist_get_current_name()))
856 return;
857
858 playlistwin_save_playlist(filename);
859 }
860 #endif
861 825
862 static void 826 static void
863 playlistwin_load_playlist(const gchar * filename) 827 playlistwin_load_playlist(const gchar * filename)
864 { 828 {
865 Playlist *playlist = playlist_get_active(); 829 Playlist *playlist = playlist_get_active();
1521 guint time, gpointer user_data) 1485 guint time, gpointer user_data)
1522 { 1486 {
1523 gint pos; 1487 gint pos;
1524 Playlist *playlist = playlist_get_active(); 1488 Playlist *playlist = playlist_get_active();
1525 1489
1526 g_return_if_fail(selection_data != NULL); 1490 g_return_if_fail(selection_data);
1527 1491
1528 if (!selection_data->data) { 1492 if (!selection_data->data) {
1529 g_message("Received no DND data!"); 1493 g_message("Received no DND data!");
1530 return; 1494 return;
1531 } 1495 }
2140 2104
2141 2105
2142 /* playlistwin_select_search callback functions 2106 /* playlistwin_select_search callback functions
2143 placed here to avoid making the code messier :) */ 2107 placed here to avoid making the code messier :) */
2144 void 2108 void
2145 playlistwin_select_search_cbt_cb( GtkWidget *called_cbt , gpointer other_cbt ) 2109 playlistwin_select_search_cbt_cb(GtkWidget *called_cbt, gpointer other_cbt)
2146 { 2110 {
2147 if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(called_cbt) ) == TRUE ) 2111 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(called_cbt)) == TRUE)
2148 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(other_cbt) , FALSE ); 2112 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(other_cbt), FALSE);
2149 return; 2113 return;
2150 } 2114 }
2151 2115
2152 static gboolean 2116 static gboolean
2153 playlistwin_select_search_kp_cb( GtkWidget *entry , GdkEventKey *event , 2117 playlistwin_select_search_kp_cb(GtkWidget *entry, GdkEventKey *event,
2154 gpointer searchdlg_win ) 2118 gpointer searchdlg_win)
2155 { 2119 {
2156 switch (event->keyval) 2120 switch (event->keyval)
2157 { 2121 {
2158 case GDK_Return: 2122 case GDK_Return:
2159 gtk_dialog_response( GTK_DIALOG(searchdlg_win) , GTK_RESPONSE_ACCEPT ); 2123 gtk_dialog_response(GTK_DIALOG(searchdlg_win), GTK_RESPONSE_ACCEPT);
2160 return TRUE; 2124 return TRUE;
2161 default: 2125 default:
2162 return FALSE; 2126 return FALSE;
2163 } 2127 }
2164 } 2128 }
2166 2130
2167 /* fileinfopopup callback for playlistwin */ 2131 /* fileinfopopup callback for playlistwin */
2168 static gboolean 2132 static gboolean
2169 playlistwin_fileinfopopup_probe(gpointer * filepopup_win) 2133 playlistwin_fileinfopopup_probe(gpointer * filepopup_win)
2170 { 2134 {
2171 gint x, y, pos; 2135 gint x, y, pos;
2172 TitleInput *tuple; 2136 TitleInput *tuple;
2173 static gint prev_x = 0, prev_y = 0, ctr = 0, prev_pos = -1; 2137 static gint prev_x = 0, prev_y = 0, ctr = 0, prev_pos = -1;
2174 static gint shaded_pos = -1, shaded_prev_pos = -1; 2138 static gint shaded_pos = -1, shaded_prev_pos = -1;
2175 gboolean skip = FALSE; 2139 gboolean skip = FALSE;
2176 GdkWindow *win; 2140 GdkWindow *win;
2177 Playlist *playlist = playlist_get_active(); 2141 Playlist *playlist = playlist_get_active();
2178 2142
2179 win = gdk_window_at_pointer(NULL, NULL); 2143 win = gdk_window_at_pointer(NULL, NULL);
2180 gdk_window_get_pointer(GDK_WINDOW(playlistwin->window), &x, &y, NULL); 2144 gdk_window_get_pointer(GDK_WINDOW(playlistwin->window), &x, &y, NULL);
2181 pos = playlist_list_get_playlist_position(playlistwin_list, x, y); 2145 pos = playlist_list_get_playlist_position(playlistwin_list, x, y);
2182 2146
2183 if (win == NULL 2147 if (win == NULL
2184 || cfg.show_filepopup_for_tuple == FALSE 2148 || cfg.show_filepopup_for_tuple == FALSE
2185 || playlistwin_list->pl_tooltips == FALSE 2149 || playlistwin_list->pl_tooltips == FALSE
2186 || pos != prev_pos 2150 || pos != prev_pos
2187 || win != GDK_WINDOW(playlistwin->window)) 2151 || win != GDK_WINDOW(playlistwin->window))
2188 { 2152 {
2189 prev_pos = pos; 2153 prev_pos = pos;
2190 ctr = 0; 2154 ctr = 0;
2191 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL); 2155 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL);
2192 return TRUE; 2156 return TRUE;
2193 } 2157 }
2194 2158
2195 if (prev_x == x && prev_y == y) 2159 if (prev_x == x && prev_y == y)
2196 ctr++; 2160 ctr++;
2197 else 2161 else
2198 { 2162 {
2199 ctr = 0; 2163 ctr = 0;
2200 prev_x = x; 2164 prev_x = x;
2201 prev_y = y; 2165 prev_y = y;
2202 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL); 2166 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL);
2203 return TRUE; 2167 return TRUE;
2204 } 2168 }
2205 2169
2206 if (playlistwin_is_shaded()) { 2170 if (playlistwin_is_shaded())
2207 shaded_pos = playlist_get_position(playlist); 2171 {
2208 if (shaded_prev_pos != shaded_pos) 2172 shaded_pos = playlist_get_position(playlist);
2209 skip = TRUE; 2173 if (shaded_prev_pos != shaded_pos)
2210 } 2174 skip = TRUE;
2175 }
2211 2176
2212 if (ctr >= cfg.filepopup_delay && (skip == TRUE || GTK_WIDGET_VISIBLE(GTK_WIDGET(filepopup_win)) != TRUE)) { 2177 if (ctr >= cfg.filepopup_delay && (skip == TRUE || GTK_WIDGET_VISIBLE(GTK_WIDGET(filepopup_win)) != TRUE)) {
2213 if (pos == -1 && !playlistwin_is_shaded()) { 2178 if (pos == -1 && !playlistwin_is_shaded())
2214 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL); 2179 {
2215 return TRUE; 2180 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL);
2216 } 2181 return TRUE;
2217 else { /* shaded mode */ 2182 }
2218 tuple = playlist_get_tuple(playlist, shaded_pos); 2183 /* shaded mode */
2219 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL); 2184 else
2220 audacious_fileinfopopup_show_from_tuple(GTK_WIDGET(filepopup_win), tuple); 2185 {
2221 shaded_prev_pos = shaded_pos; 2186 tuple = playlist_get_tuple(playlist, shaded_pos);
2222 } 2187 audacious_fileinfopopup_hide(GTK_WIDGET(filepopup_win), NULL);
2223 2188 audacious_fileinfopopup_show_from_tuple(GTK_WIDGET(filepopup_win), tuple);
2224 prev_pos = pos; 2189 shaded_prev_pos = shaded_pos;
2225 2190 }
2226 tuple = playlist_get_tuple(playlist, pos); 2191
2227 audacious_fileinfopopup_show_from_tuple(GTK_WIDGET(filepopup_win), tuple); 2192 prev_pos = pos;
2228 } 2193
2229 2194 tuple = playlist_get_tuple(playlist, pos);
2230 return TRUE; 2195 audacious_fileinfopopup_show_from_tuple(GTK_WIDGET(filepopup_win), tuple);
2231 } 2196 }
2232 2197
2198 return TRUE;
2199 }