Changeset e33fc286262f

Timestamp:

11/18/08 01:39:05 (7 weeks ago)

Author:

milosz2@…

Branch:

trunk

Message:

* Add option to refresh shoutcast list during runtime, and also some code cleanups in the radio source generally and in shoutcast/icecast components

Files:

• com/view-albums.cc (modified) (2 diffs)
• include/mpx/com/view-albums.hh (modified) (1 diff)
• sources/radio/source-radio.cc (modified) (4 diffs)
• sources/radio/source-radio.hh (modified) (1 diff)
• sources/radio/streams-shoutcast.cc (modified) (6 diffs)
• sources/radio/streams-shoutcast.hh (modified) (2 diffs)

com/view-albums.cc

@@ -395 +395 @@
                         AlbumsTreeStore->set_sort_column(0, Gtk::SORT_ASCENDING);
 
-                        m_DiscDefault_Pixbuf =
-                                Gdk::Pixbuf::create_from_file(
-                                                build_filename(
-                                                        DATA_DIR,
-                                                        build_filename("images","disc.png")
-                                                        )
-                                                )->scale_simple(90,90,Gdk::INTERP_BILINEAR);
-
-                        m_DiscDefault = Util::cairo_image_surface_from_pixbuf(m_DiscDefault_Pixbuf->scale_simple(90,90,Gdk::INTERP_BILINEAR));
+                        m_DiscDefault_DND = IconTheme::get_default()->load_icon("gnome-dev-cdrom-audio", 128);
+                        m_DiscDefault = Util::cairo_image_surface_from_pixbuf(m_DiscDefault_DND->scale_simple(90,90,Gdk::INTERP_BILINEAR));
 
                         std::vector<TargetEntry> Entries;
@@ -565 +558 @@
                                         }
 
-                                        drag_source_set_icon(m_DiscDefault_Pixbuf->scale_simple(128,128,Gdk::INTERP_BILINEAR));
+                                        drag_source_set_icon(m_DiscDefault_DND->scale_simple(128,128,Gdk::INTERP_BILINEAR));
                                 }
                                 else

include/mpx/com/view-albums.hh

@@ -218 +218 @@
 
                             Cairo::RefPtr<Cairo::ImageSurface>    m_DiscDefault;
-                            Glib::RefPtr<Gdk::Pixbuf>             m_DiscDefault_Pixbuf;
+                            Glib::RefPtr<Gdk::Pixbuf>             m_DiscDefault_DND;
                             Glib::RefPtr<Gdk::Pixbuf>             m_Emblem[N_EMS];
                             Glib::RefPtr<Gdk::Pixbuf>             m_Stars[N_STARS];

sources/radio/source-radio.cc

@@ -50 +50 @@
 using namespace Gtk;
 
-#define RADIO_ACTION_UPDATE_LIST    "radio-action-update-list"
-
 namespace
 {
-  enum Page
-  {
-    PAGE_SHOUTCAST,
-    PAGE_ICECAST,
-  };
+    enum Page
+    {
+      PAGE_SHOUTCAST,
+      PAGE_ICECAST,
+    };
+
+    const char RADIO_ACTION_UPDATE_XIPH[] = "radio-action-update-xiph";
+    const char RADIO_ACTION_UPDATE_SHOUT[] = "radio-action-update-shout";
+
 
     char const * ui_source =
@@ -66 +68 @@
     "   <placeholder name='placeholder-source'>"
     "     <menu action='menu-source-radio'>"
-    "         <menuitem action='radio-action-update-list'/>"
+    "         <menuitem action='radio-action-update-xiph'/>"
+    "         <menuitem action='radio-action-update-shout'/>"
     "     </menu>"
     "   </placeholder>"
@@ -163 +166 @@
 
                 m_ui_manager = ui_manager; 
+
                 m_actions = ActionGroup::create ("Actions_Radio");
-                m_actions->add (Action::create ("menu-source-radio", _("Radio")));
-
-                m_actions->add  (Action::create (RADIO_ACTION_UPDATE_LIST,
-                                                                                  Gtk::Stock::REFRESH,
-                                                                                  _("Update Icecast List")),
-                                                                                  (sigc::mem_fun (*this, &Radio::on_update_list)));
+
+                m_actions->add (Action::create(
+                            "menu-source-radio",
+                            _("Radio")
+        ));
+
+                m_actions->add (Action::create(
+                            RADIO_ACTION_UPDATE_XIPH,
+                                                        Gtk::Stock::REFRESH,
+                                                        _("Icecast: Update List")),
+                                                        sigc::mem_fun(
+                                *m_icecast_list,
+                                &RadioDirectory::Icecast::refresh
+        ));
+
+                m_actions->add (Action::create(
+                            RADIO_ACTION_UPDATE_SHOUT,
+                                                        Gtk::Stock::REFRESH,
+                                                        _("SHOUTcast: Update List")),
+                                                        sigc::mem_fun(
+                                *m_shoutcast_base,
+                                &RadioDirectory::Shoutcast::refresh
+        ));
+
 
                 m_ui_manager->insert_action_group (m_actions);
@@ -209 +231 @@
                           m_Caps = Caps (m_Caps & ~C_CAN_PLAY);
                 Signals.Caps.emit (m_Caps);
-    }
-
-    void
-    Radio::on_update_list ()
-    {
-                if( m_notebook_radio->get_current_page() == 1)
-                {
-                  m_notebook_icecast->set_current_page(1);
-                  m_icecast_list->refresh();
-                }
     }
 

sources/radio/source-radio.hh

@@ -94 +94 @@
 
         void
-        on_update_list ();
-
-        void
         on_set_notebook_page ();
 

sources/radio/streams-shoutcast.cc

@@ -63 +63 @@
       {
         Data.Cache = g_hash_table_new_full (g_str_hash,g_str_equal,GDestroyNotify(g_free),GDestroyNotify(xmlFreeDoc));
-        build_genre_list ();
-      }
-
-      Shoutcast::~Shoutcast ()
-      {
-        g_hash_table_destroy (Data.Cache);
-      }
-
-      SignalListUpdated&
-      Shoutcast::signal_list_updated ()
-      {
-        return Signals.ListUpdated;
-      }
-
-      SignalStartStop&
-      Shoutcast::signal_start ()
-      {
-        return Signals.Start;
-      }
-
-      SignalStartStop&
-      Shoutcast::signal_stop ()
-      {
-        return Signals.Stop;
-      }
-
-      void
-      Shoutcast::genre_cell_data_func (CellRenderer                *cell,
-                                       TreeModel::iterator const&   iter)
-      {
-        CellRendererText *cell_text = reinterpret_cast<CellRendererText *>(cell);
-        ustring genre = (*iter)[columns.name];
-
-        if (g_hash_table_lookup (Data.Cache, genre.c_str()))
-            cell_text->property_markup () = ((boost::format ("<b>%s</b>")) % std::string(Markup::escape_text(genre))).str();
-        else
-            cell_text->property_markup () = Markup::escape_text (genre);
-      }
-
-      void
-      Shoutcast::build_genre_list ()
-      {
-        xmlDocPtr             doc;
-        xmlXPathObjectPtr     xpathobj;
-        xmlNodeSetPtr         nv;
-
-        MPX::URI u ((boost::format ("http://%s/%s") % SHOUTCAST_HOST % SHOUTCAST_PATH).str());
-        Soup::RequestSyncRefP request = Soup::RequestSync::create (ustring (u));
-        guint code = request->run ();
-        if (code != 200) return;
-
-        std::string data = request->get_data(); 
-        doc = xmlParseMemory ((const char*)(data.c_str()), data.size());
-        if (!doc) return;
-
-        xpathobj = xpath_query (doc, BAD_CAST "//genre", NULL);
-        nv = xpathobj->nodesetval;
 
         CellRendererText *cell;
@@ -126 +69 @@
         get_column (0)->set_resizable (false);
         get_column (0)->set_sizing (TREE_VIEW_COLUMN_AUTOSIZE);
-
         Data.Genres = ListStore::create (columns);
+        set_model (Data.Genres);
+        get_column (0)->set_cell_data_func (*cell, sigc::mem_fun (this, &MPX::RadioDirectory::Shoutcast::Shoutcast::genre_cell_data_func));
+        get_selection()->set_mode (SELECTION_BROWSE);
+        get_selection()->signal_changed().connect (sigc::mem_fun (this, &MPX::RadioDirectory::Shoutcast::Shoutcast::refresh_wrapper));
+
+        refresh ();
+      }
+
+      Shoutcast::~Shoutcast ()
+      {
+        g_hash_table_destroy (Data.Cache);
+      }
+
+      SignalListUpdated&
+      Shoutcast::signal_list_updated ()
+      {
+        return Signals.ListUpdated;
+      }
+
+      SignalStartStop&
+      Shoutcast::signal_start ()
+      {
+        return Signals.Start;
+      }
+
+      SignalStartStop&
+      Shoutcast::signal_stop ()
+      {
+        return Signals.Stop;
+      }
+
+      void
+      Shoutcast::genre_cell_data_func (CellRenderer                *cell,
+                                       TreeModel::iterator const&   iter)
+      {
+        CellRendererText *cell_text = reinterpret_cast<CellRendererText *>(cell);
+        ustring genre = (*iter)[columns.name];
+
+        if (g_hash_table_lookup (Data.Cache, genre.c_str()))
+            cell_text->property_markup () = ((boost::format ("<b>%s</b>")) % std::string(Markup::escape_text(genre))).str();
+        else
+            cell_text->property_markup () = Markup::escape_text (genre);
+      }
+
+      void
+      Shoutcast::refresh ()
+      {
+        xmlDocPtr             doc;
+        xmlXPathObjectPtr     xpathobj;
+        xmlNodeSetPtr         nv;
+
+        MPX::URI u ((boost::format ("http://%s/%s") % SHOUTCAST_HOST % SHOUTCAST_PATH).str());
+        Soup::RequestSyncRefP request = Soup::RequestSync::create (ustring (u));
+        guint code = request->run ();
+        if (code != 200) return;
+
+        std::string data = request->get_data(); 
+        doc = xmlParseMemory ((const char*)(data.c_str()), data.size());
+        if (!doc) return;
+
+        xpathobj = xpath_query (doc, BAD_CAST "//genre", NULL);
+        nv = xpathobj->nodesetval;
+
+        Data.Genres->clear();
         (*Data.Genres->append())[columns.name] = "Top500";
         (*Data.Genres->append())[columns.name] = _(CUSTOM_SEARCH);
@@ -136 +142 @@
           g_free (prop);
         }
-
-        set_model (Data.Genres);
-
-        get_column (0)->set_cell_data_func (*cell, sigc::mem_fun (this, &MPX::RadioDirectory::Shoutcast::Shoutcast::genre_cell_data_func));
-        get_selection()->set_mode (SELECTION_BROWSE);
-        get_selection()->signal_changed().connect (sigc::mem_fun (this, &MPX::RadioDirectory::Shoutcast::Shoutcast::refresh_wrapper));
 
         xmlXPathFreeObject (xpathobj);
@@ -159 +159 @@
           {
             Data.CurrentIter = iter; 
-            refresh (0); // FIXME: Use an enum here that says something
+            rebuild_list(false); 
           }
           else
@@ -263 +263 @@
 
       void
-      Shoutcast::refresh (bool force)
+      Shoutcast::rebuild_list (bool force)
       {
         if (!get_selection()->count_selected_rows())
@@ -299 +299 @@
         if (g_hash_table_lookup (Data.Cache, genre.c_str()))
         {
-          refresh (1);
+          rebuild_list(true);
         }
       }

sources/radio/streams-shoutcast.hh

@@ -72 +72 @@
         virtual ~Shoutcast ();
 
-        void refresh (bool force = false);
+        void  refresh ();
 
         SignalListUpdated&
@@ -92 +92 @@
 
         void  genre_cell_data_func (Gtk::CellRenderer *cell, Gtk::TreeIter const& iter);
-        void  build_genre_list ();
         void  refresh_wrapper ();
         void  refresh_parse_and_emit_updated (xmlDocPtr doc);
         void  refresh_callback (char const* data, guint size, guint code, std::string const& genre);
+        void  rebuild_list (bool force = false);
 
         struct DataT