diff base/PlayParameterRepository.cpp @ 847:2d53205f70cd tonioni

Merge from default branch

--- a/base/PlayParameterRepository.cpp	Fri Nov 22 10:37:28 2013 +0000
+++ b/base/PlayParameterRepository.cpp	Tue Nov 26 14:37:01 2013 +0000
@@ -35,14 +35,14 @@
 void
 PlayParameterRepository::addPlayable(const Playable *playable)
 {
-   std::cerr << "PlayParameterRepository:addPlayable playable = " << playable <<  std::endl;
+    cerr << "PlayParameterRepository:addPlayable playable = " << playable <<  endl;
 
     if (!getPlayParameters(playable)) {
 
 	// Give all playables the same type of play parameters for the
 	// moment
 
-	    std::cerr << "PlayParameterRepository:addPlayable: Adding play parameters for " << playable << std::endl;
+        cerr << "PlayParameterRepository:addPlayable: Adding play parameters for " << playable << endl;
 
         PlayParameters *params = new PlayParameters;
         m_playParameters[playable] = params;
@@ -62,9 +62,8 @@
         connect(params, SIGNAL(playPluginConfigurationChanged(QString)),
                 this, SLOT(playPluginConfigurationChanged(QString)));
         
-           std::cerr << "Connected play parameters " << params << " for playable "
-                     << playable << " to this " << this << std::endl;
-
+        cerr << "Connected play parameters " << params << " for playable "
+                     << playable << " to this " << this << endl;
     }
 }    
 
@@ -72,7 +71,7 @@
 PlayParameterRepository::removePlayable(const Playable *playable)
 {
     if (m_playParameters.find(playable) == m_playParameters.end()) {
-        std::cerr << "WARNING: PlayParameterRepository::removePlayable: unknown playable " << playable << std::endl;
+        cerr << "WARNING: PlayParameterRepository::removePlayable: unknown playable " << playable << endl;
         return;
     }
     delete m_playParameters[playable];
@@ -83,11 +82,11 @@
 PlayParameterRepository::copyParameters(const Playable *from, const Playable *to)
 {
     if (!getPlayParameters(from)) {
-        std::cerr << "ERROR: PlayParameterRepository::copyParameters: source playable unknown" << std::endl;
+        cerr << "ERROR: PlayParameterRepository::copyParameters: source playable unknown" << endl;
         return;
     }
     if (!getPlayParameters(to)) {
-        std::cerr << "WARNING: PlayParameterRepository::copyParameters: target playable unknown, adding it now" << std::endl;
+        cerr << "WARNING: PlayParameterRepository::copyParameters: target playable unknown, adding it now" << endl;
         addPlayable(to);
     }
     getPlayParameters(to)->copyFrom(getPlayParameters(from));
@@ -137,7 +136,7 @@
 void
 PlayParameterRepository::clear()
 {
-//    std::cerr << "PlayParameterRepository: PlayParameterRepository::clear" << std::endl;
+//    cerr << "PlayParameterRepository: PlayParameterRepository::clear" << endl;
     while (!m_playParameters.empty()) {
 	delete m_playParameters.begin()->second;
 	m_playParameters.erase(m_playParameters.begin());