[Traverso-commit] traverso/src core/Information.cpp core/InputEng...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/17 23:29:39

Modified files:
        src/core       : Information.cpp InputEngine.cpp MonoReader.cpp 
                         ResourcesManager.cpp Themer.cpp 
        src/traverso/widgets: ResourcesWidget.cpp 

Log message:
        * suppres useless printfs
        * align up button to the left (FileView)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Information.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.cpp?cvsroot=traverso&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MonoReader.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResourcesManager.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Themer.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.18&r2=1.19

Patches:
Index: core/Information.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Information.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- core/Information.cpp        2 Apr 2007 20:51:45 -0000       1.3
+++ core/Information.cpp        17 May 2007 23:29:39 -0000      1.4
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: Information.cpp,v 1.3 2007/04/02 20:51:45 r_sijrier Exp $
+    $Id: Information.cpp,v 1.4 2007/05/17 23:29:39 r_sijrier Exp $
 */
 
 #include "Information.h"
@@ -37,7 +37,7 @@
         InfoStruct s;
         s.message = mes;
         s.type = INFO;
-       PWARN("Information::information %s", QS_C(mes));
+       PMESG("Information::information %s", QS_C(mes));
        emit message(s);
 }
 

Index: core/InputEngine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- core/InputEngine.cpp        7 May 2007 18:15:30 -0000       1.53
+++ core/InputEngine.cpp        17 May 2007 23:29:39 -0000      1.54
@@ -176,7 +176,7 @@
        sCollectedNumber = "-1";
        activate();
        
-#define profile
+//#define profile
 
 #if defined (profile)
        trav_time_t starttime = get_microseconds();

Index: core/MonoReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MonoReader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- core/MonoReader.cpp 17 May 2007 21:38:15 -0000      1.8
+++ core/MonoReader.cpp 17 May 2007 23:29:39 -0000      1.9
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: MonoReader.cpp,v 1.8 2007/05/17 21:38:15 r_sijrier Exp $
+$Id: MonoReader.cpp,v 1.9 2007/05/17 23:29:39 r_sijrier Exp $
 */
 
 
@@ -273,7 +273,7 @@
 {
        // Do nothing if we passed the lenght of the AudioFile.
        if (m_rbFileReadPos >= m_length) {
-               printf("returning, m_rbFileReadPos > m_length! (%d >  %d)\n", 
m_rbFileReadPos, m_source->m_length);
+//             printf("returning, m_rbFileReadPos > m_length! (%d >  %d)\n", 
m_rbFileReadPos, m_source->m_length);
                if (m_syncInProgress) {
                        finish_resync();
                }

Index: core/ResourcesManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResourcesManager.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- core/ResourcesManager.cpp   17 May 2007 21:38:15 -0000      1.15
+++ core/ResourcesManager.cpp   17 May 2007 23:29:39 -0000      1.16
@@ -225,7 +225,7 @@
        // When the AudioSource is "get", do a ref counting.
        // If the source allready was ref counted, create a deep copy
        if (source->ref()) {
-               PWARN("Creating deep copy of ReadSource: %s", 
QS_C(source->get_name()));
+               PMESG("Creating deep copy of ReadSource: %s", 
QS_C(source->get_name()));
                source = source->deep_copy();
                source->ref();
        }

Index: core/Themer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Themer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- core/Themer.cpp     7 May 2007 18:28:55 -0000       1.3
+++ core/Themer.cpp     17 May 2007 23:29:39 -0000      1.4
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: Themer.cpp,v 1.3 2007/05/07 18:28:55 n_doebelin Exp $
+$Id: Themer.cpp,v 1.4 2007/05/17 23:29:39 r_sijrier Exp $
 */
 
 #include "Themer.h"
@@ -128,8 +128,10 @@
                printf("File %s doesn't exit, falling back to default 
(TraversoLight) theme\n", QS_C(m_themefile));
                file.setFileName(":/themes/TraversoLight/traversotheme.xml");
        } else {
+               if (!m_themefile.contains(":/")) {
                m_watcher->addPath(m_themefile);
-               printf("Using themefile: %s\n", QS_C(m_themefile));
+               }
+               printf("Themer:: Using themefile: %s\n", QS_C(m_themefile));
        }
 
        if (!file.open(QIODevice::ReadOnly)) {

Index: traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- traverso/widgets/ResourcesWidget.cpp        17 May 2007 21:38:16 -0000      
1.18
+++ traverso/widgets/ResourcesWidget.cpp        17 May 2007 23:29:39 -0000      
1.19
@@ -73,14 +73,15 @@
                QPushButton* button = new QPushButton(this);
                QIcon icon = 
QApplication::style()->standardIcon(QStyle::SP_FileDialogToParent);
                button->setIcon(icon);
+               button->setMaximumHeight(23);
                
                QHBoxLayout* hlay = new QHBoxLayout;
-               hlay->addWidget(m_box, 10);
                hlay->addWidget(button);
-               hlay->addSpacing(2);
+               hlay->addWidget(m_box, 10);
                
                QVBoxLayout* lay = new QVBoxLayout(this);
                lay->setMargin(0);
+               lay->setSpacing(6);
                lay->addLayout(hlay);
                lay->addWidget(m_dirView);
                
@@ -264,8 +265,6 @@
 
 void ResourcesWidget::add_clip(AudioClip * clip)
 {
-       printf("clip_added: clip is %lld\n", clip->get_id());
-       
        QTreeWidgetItem* item = m_clipindices.value(clip->get_id());
        
        if (!item) {