WIP. Logger for every modules

ui/audio/AudioDatabaseWidget.cpp

@@ -72,15 +72,12 @@ AudioDatabaseWidget::handleFilterUpdated(std::size_t idFilterUpdated)
 
 	_refreshingFilters = true;
 
-	std::cout << "FILTER " << idFilterUpdated << " has been UPDATED!" << std::endl;
-
 	FilterWidget::Constraint currentConstraint;
 
 	currentConstraint.where.And( WhereClause( "track.artist_id = artist.id and track.release_id = release.id and track_genre.track_id = track.id and genre.id = track_genre.genre_id"));
 
 	for (std::size_t idFilter = 0; idFilter < _filters.size(); ++idFilter)
 	{
-		std::cout << "Processing Filter INDEX " << idFilter << std::endl;
 		FilterWidget* filter = _filters.at(idFilter);
 
 		// Apply contraints created by previous filters
@@ -100,8 +97,6 @@ AudioDatabaseWidget::handleFilterUpdated(std::size_t idFilterUpdated)
 void
 AudioDatabaseWidget::selectNextTrack(void)
 {
-	std::cout << "Wants to select next track!" << std::endl;
-
 	TrackWidget* trackWidget ( dynamic_cast<TrackWidget*>(_filters.back() ) );
 
 	trackWidget->selectNextTrack();

ui/audio/AudioMediaPlayerWidget.cpp

@@ -94,8 +94,6 @@ AudioMediaPlayerWidget::handlePlayOffset(int offsetSecs)
 	if (!_currentParameters)
 		return;
 
-	std::cout << "Want to play at offset " << offsetSecs << std::endl;;
-
 	_currentParameters->setOffset( boost::posix_time::seconds(offsetSecs) );
 
 	loadPlayer();
@@ -107,41 +105,37 @@ AudioMediaPlayerWidget::handlePlayOffset(int offsetSecs)
 void
 AudioMediaPlayerWidget::handlePlayNext(void)
 {
-	std::cout << "Want to play next!" << std::endl;
+	// TODO
 }
 
 void
 AudioMediaPlayerWidget::handlePlayPrev(void)
 {
-	std::cout << "Want to play prev!" << std::endl;
+	// TODO
 }
 
 
 void
 AudioMediaPlayerWidget::handleTrackEnded(void)
 {
-	std::cout << "Track playback ended!" << std::endl;
 	_playbackEnded.emit();
 }
 
 void
 AudioMediaPlayerWidget::handleValueChanged(double value)
 {
-	std::cout << "Value changed!" << std::endl;
-
+	// TODO
 }
 
 void
 AudioMediaPlayerWidget::handleSliderMoved(int value)
 {
-	std::cout << "Slider moved to " << value << std::endl;
+	;
 }
 
 void
 AudioMediaPlayerWidget::handleTimeUpdated(void)
 {
-	std::cout << "Time updated to " << _mediaPlayer->currentTime() << std::endl;
-
 	if (!_currentParameters)
 		return;
 

ui/audio/AudioWidget.cpp

@@ -1,5 +1,7 @@
 #include <Wt/WBreak>
 
+#include "logger/Logger.hpp"
+
 #include "AudioWidget.hpp"
 
 namespace UserInterface {
@@ -37,7 +39,7 @@ AudioWidget::search(const std::string& searchText)
 void
 AudioWidget::playTrack(boost::filesystem::path p)
 {
-	std::cout << "play track '" << p << "'" << std::endl;
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "play track '" << p << "'";
 	try {
 
 		std::size_t bitrate = 0;
@@ -65,15 +67,15 @@ AudioWidget::playTrack(boost::filesystem::path p)
 
 			if (!covers.empty())
 			{
-				std::cout << "Cover found!" << std::endl;
+				LMS_LOG(MOD_UI, SEV_DEBUG) << "Cover found!";
 				if (!covers.front().scale(256))
-					std::cerr << "Cannot resize!" << std::endl;
+					LMS_LOG(MOD_UI, SEV_ERROR) << "Cannot resize!";
 
 				//_imgResource->setMimeType(covers.front().getMimeType());
 				_imgResource->setData(covers.front().getData());
 			}
 			else {
-				std::cout << "No cover found!" << std::endl;
+				LMS_LOG(MOD_UI, SEV_DEBUG) << "No cover found!";
 				_imgResource->setData( std::vector<unsigned char>());
 			}
 
@@ -82,14 +84,14 @@ AudioWidget::playTrack(boost::filesystem::path p)
 	}
 	catch( std::exception &e)
 	{
-		std::cerr <<"Caught exception while loading '" << p << "': " << e.what() << std::endl;
+		LMS_LOG(MOD_UI, SEV_ERROR) << "Caught exception while loading '" << p << "': " << e.what();
 	}
 }
 
 	void
 AudioWidget::handleTrackEnded(void)
 {
-	std::cout << "Track playback ended!" << std::endl;
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "Track playback ended!";
 	_audioDbWidget->selectNextTrack();
 }
 

ui/audio/TableFilterWidget.cpp

@@ -1,5 +1,7 @@
 #include <boost/foreach.hpp>
 
+#include "logger/Logger.hpp"
+
 #include "TableFilterWidget.hpp"
 
 namespace UserInterface {
@@ -41,20 +43,20 @@ TableFilterWidget::refresh(const Constraint& constraint)
 	SqlQuery AllSqlQuery;
 	AllSqlQuery.select("'<All>',0,1 AS ORDERBY");
 
-	std::cout << _table << ", generated query = '" << sqlQuery.get() + " UNION " + AllSqlQuery.get() << "'" << std::endl;
+	LMS_LOG(MOD_UI, SEV_DEBUG) << _table << ", generated query = '" << sqlQuery.get() + " UNION " + AllSqlQuery.get() << "'";
 
 	Wt::Dbo::Query<ResultType> query = _db.getSession().query<ResultType>( sqlQuery.get() + " UNION " + AllSqlQuery.get() );
 
 	query.orderBy("ORDERBY DESC," + _table + "." + _field);
 
 	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs()) {
-		std::cout << "Binding value '" << bindArg << "'" << std::endl;
+		LMS_LOG(MOD_UI, SEV_DEBUG) << "Binding value '" << bindArg << "'";
 		query.bind(bindArg);
 	}
 
 	_queryModel.setQuery( query, true /* Keep columns */);
 
-	std::cout << "Finish !" << std::endl;
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "Finish !";
 }
 
 // Get constraint created by this filter

ui/audio/TrackWidget.cpp

@@ -4,6 +4,8 @@
 #include <Wt/WItemDelegate>
 #include <Wt/WBreak>
 
+#include "logger/Logger.hpp"
+
 #include "TrackWidget.hpp"
 
 namespace UserInterface {
@@ -76,14 +78,14 @@ TrackWidget::refresh(const Constraint& constraint)
 	sqlQuery.from().And( FromClause("artist,release,track,genre,track_genre"));
 	sqlQuery.where().And(constraint.where);
 
-	std::cout << "TRACK REQ = '" << sqlQuery.get() << "'" << std::endl;
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "TRACK REQ = '" << sqlQuery.get() << "'";
 
 	Wt::Dbo::Query<ResultType> query = _db.getSession().query<ResultType>( sqlQuery.get() );
 
 	query.groupBy("track").orderBy("artist.name,track.creation_time,release.name,track.disc_number,track.track_number");
 
 	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs()) {
-		std::cout << "Binding value '" << bindArg << "'" << std::endl;
+		LMS_LOG(MOD_UI, SEV_DEBUG) << "Binding value '" << bindArg << "'";
 		query.bind(bindArg);
 	}