changeset 2628:c45acc6e352c

make few more things working
author Tomasz Mon <desowin@gmail.com>
date Thu, 22 May 2008 16:31:25 +0200
parents c0a35d3d5bb9
children 2ce9e17525dc
files src/skins/ui_fileopener.c src/skins/ui_main.c
diffstat 2 files changed, 10 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/skins/ui_fileopener.c	Thu May 22 15:42:44 2008 +0200
+++ b/src/skins/ui_fileopener.c	Thu May 22 16:31:25 2008 +0200
@@ -28,9 +28,7 @@
 #include <audacious/playback.h>
 #include <audacious/playlist.h>
 #include <audacious/strings.h>
-#if 0
 #include "ui_playlist.h"
-#endif
 #include "skins_cfg.h"
 
 static void
@@ -48,14 +46,12 @@
             aud_playlist_add_dir(playlist, filename ? filename : (const gchar *) cur->data);
         } else {
             aud_playlist_add(playlist, filename ? filename : (const gchar *) cur->data);
-        }       
+        }
 
         g_free(filename);
-    } 
+    }
 
-#if 0
     playlistwin_update_list(playlist);
-#endif
 
     ptr = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(browser));
 
@@ -87,10 +83,8 @@
     g_slist_foreach(files, (GFunc) g_free, NULL);
     g_slist_free(files);
 
-#if 0
     if (play_button)
-        playback_initiate();
-#endif
+        audacious_drct_initiate();
 
     if (config.close_dialog_open)
         gtk_widget_destroy(window);
@@ -290,15 +284,12 @@
     char *ptr;
     Playlist *playlist = aud_playlist_get_active();
 
-
     while (files[ctr] != NULL) {
         gchar *filename = g_filename_to_uri((const gchar *) files[ctr++], NULL, NULL);
         aud_playlist_add(playlist, filename);
         g_free(filename);
     }
-#if 0
     playlistwin_update_list(playlist);
-#endif
 
     gtk_label_get(GTK_LABEL(GTK_BIN(filesel->history_pulldown)->child),
           &ptr);
@@ -329,9 +320,8 @@
     files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
     filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
     gtk_widget_destroy(filesel);
-#if 0
-    playback_initiate();
-#endif
+
+    audacious_drct_initiate();
 }
 
 static void filebrowser_add_selected_files_classic(GtkWidget * w, gpointer data)
--- a/src/skins/ui_main.c	Thu May 22 15:42:44 2008 +0200
+++ b/src/skins/ui_main.c	Thu May 22 16:31:25 2008 +0200
@@ -1117,15 +1117,14 @@
                       GtkWidget * entry)
 {
     Playlist *playlist = aud_playlist_get_active();
-#if 0
+
     const gchar *text = gtk_entry_get_text(GTK_ENTRY(entry));
     if (text && *text)
     {
         aud_playlist_clear(playlist);
         aud_playlist_add_url(playlist, text);
-        playback_initiate();
+        audacious_drct_initiate();
     }
-#endif
 }
 
 static void
@@ -1289,9 +1288,7 @@
 void
 mainwin_eject_pushed(void)
 {
-#if 0
     run_filebrowser(PLAY_BUTTON);
-#endif
 }
 
 void
@@ -1778,15 +1775,18 @@
         case MAINWIN_GENERAL_ABOUT:
             show_about_window();
             break;
+#endif
         case MAINWIN_GENERAL_PLAYFILE:
             run_filebrowser(NO_PLAY_BUTTON);
             break;
         case MAINWIN_GENERAL_PLAYLOCATION:
             mainwin_show_add_url_window();
             break;
+#if 0
         case MAINWIN_GENERAL_FILEINFO:
             ui_fileinfo_show_current(playlist);
             break;
+#endif
         case MAINWIN_GENERAL_FOCUSPLWIN:
             gtk_window_present(GTK_WINDOW(playlistwin));
             break;
@@ -1799,14 +1799,12 @@
             else
                 playlistwin_hide();
             break;
-#endif
         case MAINWIN_GENERAL_SHOWEQWIN:
             if (GTK_CHECK_MENU_ITEM(item)->active)
                 equalizerwin_real_show();
             else
                 equalizerwin_real_hide();
             break;
-
         case MAINWIN_GENERAL_PREV:
             aud_playlist_prev(playlist);
             break;
@@ -2598,9 +2596,7 @@
 action_autoscroll_songname( GtkToggleAction * action )
 {
     mainwin_set_title_scroll(gtk_toggle_action_get_active(action));
-#if 0
     playlistwin_set_sinfo_scroll(config.autoscroll); /* propagate scroll setting to playlistwin_sinfo */
-#endif
 }
 
 void
@@ -2782,9 +2778,7 @@
 void
 action_play_file( void )
 {
-#if 0
     run_filebrowser(PLAY_BUTTON);
-#endif
 }
 
 void