playlist: rename remaining old private members

src/actions.cpp

@@ -1860,7 +1860,7 @@ void ApplyFilter::run()
 	if (myScreen == myPlaylist)
 	{
 		myPlaylist->EnableHighlighting();
-		Playlist::ReloadTotalLength = true;
+		myPlaylist->reloadTotalLength();
 		drawHeader();
 	}
 	listsChangeFinisher();

src/playlist.cpp

@@ -40,10 +40,7 @@ using Global::MainStartY;
 
 Playlist *myPlaylist;
 
-bool Playlist::ReloadTotalLength = 0;
+namespace {
-bool Playlist::ReloadRemaining = false;
-
-namespace {//
 
 std::string songToString(const MPD::Song &s);
 bool playlistEntryMatcher(const boost::regex &rx, const MPD::Song &s);
@@ -51,7 +48,8 @@ bool playlistEntryMatcher(const boost::regex &rx, const MPD::Song &s);
 }
 
 Playlist::Playlist()
-: itsTotalLength(0), itsRemainingTime(0), itsScrollBegin(0), m_old_playlist_version(0)
+: m_total_length(0), m_remaining_time(0), m_scroll_begin(0), m_old_playlist_version(0)
+, m_reload_total_length(false), m_reload_remaining(false)
 {
 	w = NC::Menu<MPD::Song>(0, MainStartY, COLS, MainHeight, Config.playlist_display_mode == DisplayMode::Columns && Config.titles_visibility ? Display::Columns(COLS) : "", Config.main_color, NC::Border::None);
 	w.cyclicScrolling(Config.use_cyclic_scrolling);
@@ -73,7 +71,7 @@ Playlist::Playlist()
 void Playlist::switchTo()
 {
 	SwitchTo::execute(this);
-	itsScrollBegin = 0;
+	m_scroll_begin = 0;
 	EnableHighlighting();
 	drawHeader();
 }
@@ -103,9 +101,9 @@ void Playlist::resize()
 std::wstring Playlist::title()
 {
 	std::wstring result = L"Playlist ";
-	if (ReloadTotalLength || ReloadRemaining)
+	if (m_reload_total_length || m_reload_remaining)
-		itsBufferedStats = TotalLength();
+		m_stats = getTotalLength();
-	result += Scroller(ToWString(itsBufferedStats), itsScrollBegin, COLS-result.length()-(Config.design == Design::Alternative ? 2 : Global::VolumeState.length()));
+	result += Scroller(ToWString(m_stats), m_scroll_begin, COLS-result.length()-(Config.design == Design::Alternative ? 2 : Global::VolumeState.length()));
 	return result;
 }
 
@@ -113,7 +111,7 @@ void Playlist::update()
 {
 	if (w.isHighlighted()
 	&&  Config.playlist_disable_highlight_delay.time_duration::seconds() > 0
-	&&  Global::Timer - itsTimer > Config.playlist_disable_highlight_delay)
+	&&  Global::Timer - m_timer > Config.playlist_disable_highlight_delay)
 	{
 		w.setHighlighting(false);
 		w.refresh();
@@ -283,26 +281,26 @@ void Playlist::Reverse()
 void Playlist::EnableHighlighting()
 {
 	w.setHighlighting(true);
-	itsTimer = Global::Timer;
+	m_timer = Global::Timer;
 }
 
-std::string Playlist::TotalLength()
+std::string Playlist::getTotalLength()
 {
 	std::ostringstream result;
 	
-	if (ReloadTotalLength)
+	if (m_reload_total_length)
 	{
-		itsTotalLength = 0;
+		m_total_length = 0;
-		for (size_t i = 0; i < w.size(); ++i)
+		for (const auto &s : w)
-			itsTotalLength += w[i].value().getDuration();
+			m_total_length += s.value().getDuration();
-		ReloadTotalLength = 0;
+		m_reload_total_length = false;
 	}
-	if (Config.playlist_show_remaining_time && ReloadRemaining && !w.isFiltered())
+	if (Config.playlist_show_remaining_time && m_reload_remaining && !w.isFiltered())
 	{
-		itsRemainingTime = 0;
+		m_remaining_time = 0;
 		for (size_t i = currentSongPosition(); i < w.size(); ++i)
-			itsRemainingTime += w[i].value().getDuration();
+			m_remaining_time += w[i].value().getDuration();
-		ReloadRemaining = false;
+		m_reload_remaining = false;
 	}
 	
 	result << '(' << w.size() << (w.size() == 1 ? " item" : " items");
@@ -316,15 +314,15 @@ std::string Playlist::TotalLength()
 			result << " (out of " << real_size << ")";
 	}
 	
-	if (itsTotalLength)
+	if (m_total_length)
 	{
 		result << ", length: ";
-		ShowTime(result, itsTotalLength, Config.playlist_shorten_total_times);
+		ShowTime(result, m_total_length, Config.playlist_shorten_total_times);
 	}
-	if (Config.playlist_show_remaining_time && itsRemainingTime && !w.isFiltered() && w.size() > 1)
+	if (Config.playlist_show_remaining_time && m_remaining_time && !w.isFiltered() && w.size() > 1)
 	{
 		result << " :: remaining: ";
-		ShowTime(result, itsRemainingTime, Config.playlist_shorten_total_times);
+		ShowTime(result, m_remaining_time, Config.playlist_shorten_total_times);
 	}
 	result << ')';
 	return result.str();
@@ -362,20 +360,20 @@ unsigned Playlist::currentSongLength() const
 
 bool Playlist::checkForSong(const MPD::Song &s)
 {
-	return itsSongHashes.find(s.getHash()) != itsSongHashes.end();
+	return m_song_hashes.find(s.getHash()) != m_song_hashes.end();
 }
 
 void Playlist::registerHash(size_t hash)
 {
-	++itsSongHashes[hash];
+	++m_song_hashes[hash];
 }
 
 void Playlist::unregisterHash(size_t hash)
 {
-	auto it = itsSongHashes.find(hash);
+	auto it = m_song_hashes.find(hash);
-	assert(it != itsSongHashes.end());
+	assert(it != m_song_hashes.end());
 	if (it->second == 1)
-		itsSongHashes.erase(it);
+		m_song_hashes.erase(it);
 	else
 		--it->second;
 }

src/playlist.h

@@ -84,26 +84,30 @@ struct Playlist: Screen<NC::Menu<MPD::Song>>, Filterable, HasSongs, Searchable,
 	void registerHash(size_t hash);
 	void unregisterHash(size_t hash);
 	
-	static bool ReloadTotalLength;
+	void reloadTotalLength() { m_reload_total_length = true; }
-	static bool ReloadRemaining;
+	void reloadRemaining() { m_reload_remaining = true; }
 	
 protected:
 	virtual bool isLockable() OVERRIDE { return true; }
 	
 private:
-	std::string TotalLength();
+	std::string getTotalLength();
-	std::string itsBufferedStats;
 
-	std::unordered_map<size_t, int> itsSongHashes;
+	std::string m_stats;
 	
-	size_t itsTotalLength;
+	std::unordered_map<size_t, int> m_song_hashes;
-	size_t itsRemainingTime;
-	size_t itsScrollBegin;
 	
-	boost::posix_time::ptime itsTimer;
+	size_t m_total_length;;
+	size_t m_remaining_time;
+	size_t m_scroll_begin;
+	
+	boost::posix_time::ptime m_timer;
 	
 	MPD::Status m_status;
 	unsigned m_old_playlist_version;
+
+	bool m_reload_total_length;
+	bool m_reload_remaining;
 };
 
 extern Playlist *myPlaylist;

src/status.cpp

@@ -279,8 +279,8 @@ void Status::Changes::playlist()
 	if (State::player() != MPD::psStop)
 		drawTitle(myPlaylist->nowPlayingSong());
 	
-	Playlist::ReloadTotalLength = true;
+	myPlaylist->reloadTotalLength();
-	Playlist::ReloadRemaining = true;
+	myPlaylist->reloadRemaining();
 	
 	if (isVisible(myBrowser))
 		markSongsInPlaylist(myBrowser->proxySongList());
@@ -330,13 +330,13 @@ void Status::Changes::playerState()
 	{
 		case MPD::psPlay:
 			drawTitle(myPlaylist->nowPlayingSong());
-			Playlist::ReloadRemaining = true;
+			myPlaylist->reloadRemaining();
 			break;
 		case MPD::psStop:
 			windowTitle("ncmpcpp " VERSION);
 			if (Progressbar::isUnlocked())
 				Progressbar::draw(0, 0);
-			Playlist::ReloadRemaining = true;
+			myPlaylist->reloadRemaining();
 			if (Config.design == Design::Alternative)
 			{
 				*wHeader << NC::XY(0, 0) << wclrtoeol << NC::XY(0, 1) << wclrtoeol;
@@ -381,7 +381,7 @@ void Status::Changes::songID()
 {
 	// update information about current song
 	myPlaylist->setStatus(m_status);
-	Playlist::ReloadRemaining = true;
+	myPlaylist->reloadRemaining();
 	playing_song_scroll_begin = 0;
 	first_line_scroll_begin = 0;
 	second_line_scroll_begin = 0;