core/tags/track: Remove variable accessor functions

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

core/playlist.cpp

@@ -37,7 +37,7 @@ public:
 		unsigned int total = 0, count = 0;
 
 		db_for_each(track, next, track_db_get()) {
-			total += track->count();
+			total += track->tr_count;
 			count++;
 		}
 
@@ -48,11 +48,11 @@ public:
 
 	void dynamic_add(const std::string &name, struct track *track, unsigned int avg)
 	{
-		if ((name == "Unplayed") && (track->count() == 0))
+		if ((name == "Unplayed") && (track->tr_count == 0))
 			add(track);
-		if ((name == "Most Played") && (track->count() > avg))
+		if ((name == "Most Played") && (track->tr_count > avg))
 			add(track);
-		if ((name == "Least Played") && (track->count() < avg))
+		if ((name == "Least Played") && (track->tr_count < avg))
 			add(track);
 	}
 

core/queue.cpp

@@ -46,7 +46,7 @@ void Queue :: read(file &file)
 	for (unsigned int i = 0; i < n; i++) {
 		file_readf(&file, "%u", &id);
 		_tracks[i] = track_get(id);
-		_length += _tracks[i]->length();
+		_length += _tracks[i]->tr_length;
 	}
 }
 
@@ -82,17 +82,17 @@ static inline int track_compare(struct track *lhs, struct track *rhs, sort_t fie
 	case SORT_ARTIST:
 		return artist_compare(lhs->tr_artist, rhs->tr_artist);
 	case SORT_COUNT:
-		return lhs->count() - rhs->count();
+		return lhs->tr_count - rhs->tr_count;
 	case SORT_GENRE:
 		return genre_compare(lhs->tr_genre, rhs->tr_genre);
 	case SORT_LENGTH:
-		return lhs->length() - rhs->length();
+		return lhs->tr_length - rhs->tr_length;
 	case SORT_PLAYED:
 		return rhs->compare_date(rhs);
 	case SORT_TITLE:
 		return lhs->compare(rhs);
 	case SORT_TRACK:
-		return lhs->track_nr() - rhs->track_nr();
+		return lhs->tr_track - rhs->tr_track;
 	case SORT_YEAR:
 		if (lhs->tr_album->al_year - rhs->tr_album->al_year != 0)
 			return lhs->tr_album->al_year - rhs->tr_album->al_year;
@@ -149,7 +149,7 @@ unsigned int Queue :: find_sorted_id(struct track *rhs)
 unsigned int Queue :: _add_at(struct track *track, unsigned int pos)
 {
 	_tracks.insert(_tracks.begin() + pos, track);
-	_length += track->length();
+	_length += track->tr_length;
 	_notify->on_track_added(pos);
 	return pos;
 }
@@ -164,7 +164,7 @@ unsigned int Queue :: add(struct track *track)
 
 void Queue :: del(unsigned int index)
 {
-	_length -= _tracks[index]->length();
+	_length -= _tracks[index]->tr_length;
 	_tracks.erase(_tracks.begin() + index);
 	_notify->on_track_removed(index);
 }

core/tags/track.cpp

@@ -62,10 +62,6 @@ track :: ~track()
 		tr_library->li_size--;
 }
 
-unsigned int track :: count()  { return tr_count;  }
-unsigned int track :: length() { return tr_length; }
-unsigned int track :: track_nr()  { return tr_track;  }
-
 const std::string track :: date() const
 {
 	char *buf;

gui/gst.cpp

@@ -60,7 +60,7 @@ public:
 	void load(struct track *track)
 	{
 		gchar *uri = gst_filename_to_uri(track->path().c_str(), NULL);
-		gchar *len = string_sec2str(track->length());
+		gchar *len = string_sec2str(track->tr_length);
 
 		gst_change_state(GST_STATE_NULL);
 		g_object_set(G_OBJECT(gst_player), "uri", uri, NULL);

gui/queue/model.cpp

@@ -108,11 +108,11 @@ void QueueModel::get_value_vfunc(const Gtk::TreeIter &iter, int column,
 
 	switch (column) {
 	case 0:
-		return set_val(track->track_nr(), value);
+		return set_val(track->tr_track, value);
 	case 1:
 		return set_val(track->name(), value);
 	case 2:
-		str = string_sec2str(track->length());
+		str = string_sec2str(track->tr_length);
 		set_val(Glib::ustring(str), value);
 		g_free(str);
 		return;
@@ -125,7 +125,7 @@ void QueueModel::get_value_vfunc(const Gtk::TreeIter &iter, int column,
 	case 6:
 		return set_val(track->tr_genre->ge_name, value);
 	case 7:
-		return set_val(track->count(), value);
+		return set_val(track->tr_count, value);
 	case 8:
 		return set_val(track->date(), value);
 	case 9:

include/core/tags/track.h

@@ -58,11 +58,6 @@ struct track : public GenericTag {
 	~track(); /**< Track destructor.  */
 
 
-	unsigned int count();  /**< @return Track::_count.  */
-	unsigned int length(); /**< @return Track::_length. */
-	unsigned int track_nr();  /**< @return Track::_track.  */
-
-
 	/**
 	 * @return A locale-dependent string containing the day this
 	 *         track was last played, or "Never" if the track has

tests/core/queue.cpp

@@ -100,7 +100,7 @@ void test_add_remove()
 	/* Add tracks */
 	for (unsigned int i = 0; i < 24; i++) {
 		track = track_get(i);
-		expected += track->length();
+		expected += track->tr_length;
 		test_loop_equal(q.add(track), i, i);
 		test_loop_equal(count_add, i + 1, i);
 	} test_loop_passed();
@@ -111,7 +111,7 @@ void test_add_remove()
 	/* Add everything again */
 	for (unsigned int i = 24; i < 48; i++) {
 		track = track_get(i - 24);
-		expected += track->length();
+		expected += track->tr_length;
 		test_loop_equal(q.add(track), i, i);
 		test_loop_equal(count_add, i + 1, i);
 	} test_loop_passed();
@@ -124,7 +124,7 @@ void test_add_remove()
 	for (unsigned int i = 0; i < 12; i++) {
 		track = track_get(i);
 		q.del(track);
-		expected -= track->length() * 2;
+		expected -= track->tr_length * 2;
 		test_loop_equal(count_del, (i + 1) * 2, i);
 	}
 	test_equal(q.length(), expected);
@@ -134,7 +134,7 @@ void test_add_remove()
 	/* Test removing tracks one at a time */
 	count_del = 0;
 	for (unsigned int i = 0; i < 12; i++) {
-		expected -= q[23 - i]->length();
+		expected -= q[23 - i]->tr_length;
 		q.del((unsigned int)(23 - i));
 		test_loop_equal(count_del, (i + 1), i);
 	} test_loop_passed();
@@ -145,7 +145,7 @@ void test_add_remove()
 	/* Remove remaining tracks */
 	count_del = 0;
 	for (unsigned int i = 0; i < 12; i++) {
-		expected -= q[0]->length();
+		expected -= q[0]->tr_length;
 		q.del((unsigned int)0);
 		test_loop_equal(count_del, i + 1, i);
 	} test_loop_passed();

tests/core/tags/track.cpp

@@ -35,9 +35,9 @@ static void test_track_tag_default()
 	test_equal(track.date(),        (std::string)"Never");
 	test_equal(track.path(),        (std::string)"");
 
-	test_equal(track.track_nr(),  (unsigned)0);
+	test_equal(track.tr_track,  (unsigned)0);
-	test_equal(track.length(), (unsigned)0);
+	test_equal(track.tr_length, (unsigned)0);
-	test_equal(track.count(),  (unsigned)0);
+	test_equal(track.tr_count,  (unsigned)0);
 }
 
 static void verify_track_tag(struct track *track, unsigned int size)
@@ -53,9 +53,9 @@ static void verify_track_tag(struct track *track, unsigned int size)
 	test_equal(track->path(),        (std::string)MUSIC_DIR + "/Hyrule Symphony/13 - Legend of Zelda Medley.mp3");
 	test_equal(track->primary_key(), (std::string)"0/Hyrule Symphony/13 - Legend of Zelda Medley.mp3");
 
-	test_equal(track->track_nr(),  (unsigned)13);
+	test_equal(track->tr_track,  (unsigned)13);
-	test_equal(track->length(), (unsigned)288);
+	test_equal(track->tr_length, (unsigned)288);
-	test_equal(track->count(),  (unsigned)0);
+	test_equal(track->tr_count,  (unsigned)0);
 	test_equal(library->li_size, size);
 }
 
@@ -184,11 +184,11 @@ static void test_track_tag_locale()
 	std::setlocale(LC_TIME, "C");
 	date = string_tm2str(now);
 
-	test_equal(track->count(), (unsigned)0);
+	test_equal(track->tr_count, (unsigned)0);
 	test_equal(track->date(), "Never");
 
 	track->played();
-	test_equal(track->count(), (unsigned)1);
+	test_equal(track->tr_count, (unsigned)1);
 	test_equal(track->date(), date);
 	g_free(date);
 }