Update code to match new deck layout

This patch actually breaks a bunch of things, but I just want to be done
with the deck changes for now.  I'll go back and fix things before
releasing!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

gui/gui.cpp

@@ -144,20 +144,20 @@ static bool on_window_key_pressed(GdkEventKey *event)
 		tab_focus_search();
 	else if (key >= "0" && key <= "9") {
 		unsigned int n = atoi(key.c_str());
-		if (n < deck::size())
+		if (n < deck::get_queues().size())
 			notebook->set_current_page(n);
 	} else if (key == "c")
-		notebook->set_current_page(deck::size());
+		notebook->set_current_page(deck::get_queues().size());
 	else if (key == "h")
-		notebook->set_current_page(deck::size() + 1);
+		notebook->set_current_page(deck::get_queues().size() + 1);
 	else if (key == "m")
-		notebook->set_current_page(deck::size() + 3);
+		notebook->set_current_page(deck::get_queues().size() + 3);
 	else if (key == "n")
 		on_next();
 	else if (key == "N")
 		audio :: previous();
 	else if (key == "p")
-		notebook->set_current_page(deck::size() + 2);
+		notebook->set_current_page(deck::get_queues().size() + 2);
 	else
 		return false;
 	return true;

gui/history.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <audio.h>
+#include <deck.h>
 #include <tabs.h>
 
 
@@ -13,7 +13,7 @@ public:
 
 
 HistoryTab :: HistoryTab()
-	    : Tab(audio::get_recent_pq())
+	    : Tab(deck :: get_queue())
 {
 	tab_search   = get_widget<Gtk::SearchEntry>("o_history_entry");
 	tab_size     = get_widget<Gtk::Label>("o_history_size");

gui/queue.cpp

@@ -291,7 +291,7 @@ void QueueTab :: queue_set_sensitive(bool sensitive)
 
 void QueueTab :: on_close_clicked()
 {
-	deck :: remove(tab_page_num());
+	deck :: destroy(tab_pq);
 }
 
 void QueueTab :: on_switch_changed()
@@ -319,11 +319,11 @@ static void renumber_queues()
 		it->second->on_tab_reordered();
 }
 
-static void on_pq_created(Queue *pq, unsigned int num)
+/*static void on_pq_created(Queue *pq, unsigned int num)
 {
 	QueueTab *tab = new QueueTab(pq, num);
 	tab->on_post_init();
-}
+}*/
 
 static void on_pq_removed(Queue *pq)
 {
@@ -338,8 +338,8 @@ static void on_page_reordered(Gtk::Widget *page, int num)
 {
 	Gtk::Notebook *notebook = get_widget<Gtk::Notebook>("o_notebook");
 
-	if ((unsigned int)num >= deck :: size()) {
-		notebook->reorder_child(*page, deck::size() - 1);
+	if ((unsigned int)num >= deck :: get_queues().size()) {
+		notebook->reorder_child(*page, deck::get_queues().size() - 1);
 		return;
 	}
 
@@ -354,7 +354,6 @@ static void on_page_reordered(Gtk::Widget *page, int num)
 void init_queue_tabs()
 {
 	struct Callbacks *cb = get_callbacks();
-	cb->on_pq_created = on_pq_created;
 	cb->on_pq_removed = on_pq_removed;
 
 	Gtk::Notebook *notebook = get_widget<Gtk::Notebook>("o_notebook");

gui/tabs.cpp

@@ -166,7 +166,7 @@ void Tab :: tab_queue_add(Queue *pq)
 
 bool Tab :: tab_queue_selected(bool random)
 {
-	if (deck :: size() >= 10)
+	if (deck :: get_queues().size() >= 10)
 		return true;
 
 	Queue *pq = deck :: create(random);
@@ -176,11 +176,11 @@ bool Tab :: tab_queue_selected(bool random)
 
 bool Tab :: tab_add_to_queue(unsigned int n)
 {
-	if (n >= deck :: size())
+	if (n >= deck :: get_queues().size())
 		return true;
 
-	Queue *pq = deck :: get(n);
-	tab_queue_add(pq);
+	//Queue *pq = deck :: get(n);
+	//tab_queue_add(pq);
 	return true;
 }
 
@@ -251,7 +251,7 @@ bool Tab :: on_key_press_event(const std::string &key)
 void Tab :: on_show_rc_menu()
 {
 	std::string item;
-	unsigned int size = deck :: size();
+	unsigned int size = deck :: get_queues().size();
 
 	if (size == 0) {
 		get_widget<Gtk::MenuItem>("o_add_to_pq")->hide();
@@ -521,10 +521,10 @@ void post_init_tabs()
 		it->second->on_post_init();
 
 	unsigned int tab = 0;
-	for (tab = 0; tab < deck::size(); tab++) {
-		if ((deck :: get(tab)->has_flag(Q_ENABLED)))
-			break;
-	}
+	//for (tab = 0; tab < deck::get_queues().size(); tab++) {
+	//	if ((deck :: get(tab)->has_flag(Q_ENABLED)))
+	//		break;
+	//}
 	get_widget<Gtk::Notebook>("o_notebook")->set_current_page(tab);
 }
 

lib/audio.cpp

@@ -22,24 +22,6 @@ static bool o_should_pause = false;
 static File f_cur_track("cur_track", 0);
 
 
-class RecentQueue : public Queue
-{
-public:
-	RecentQueue()
-		: Queue(Q_ENABLED | Q_REPEAT | Q_NO_SORT | Q_DISABLE_CHANGED_SIZE)
-		{}
-
-	unsigned int add(Track *track)
-	{
-		del(track);
-		_cur = 0;
-		return _add_at(track, 0);
-	}
-};
-
-static RecentQueue o_recently_played;
-
-
 static void parse_error(GstMessage *error)
 {
 	GError *err;
@@ -220,12 +202,11 @@ void audio :: next()
 
 	cur_trackid = track->id;
 	save_state();
-	o_recently_played.add(track);
 }
 
 void audio :: previous()
 {
-	Track *track = o_recently_played.next();
+	Track *track = deck :: prev();
 	if (track->id == cur_trackid)
 		return;
 
@@ -252,7 +233,7 @@ void audio :: load_trackid(unsigned int track_id)
 
 	cur_trackid = track_id;
 	save_state();
-	o_recently_played.add(track);
+	deck :: get_queue()->add(track);
 }
 
 unsigned int audio :: current_trackid()
@@ -262,11 +243,6 @@ unsigned int audio :: current_trackid()
 	return cur_trackid;
 }
 
-Queue *audio :: get_recent_pq()
-{
-	return &o_recently_played;
-}
-
 long audio :: position()
 {
 	long position;