diff --git a/app/VideoHandle.h b/app/VideoHandle.h
index 2381f57..1a2f3d0 100644
--- a/app/VideoHandle.h
+++ b/app/VideoHandle.h
@@ -34,7 +34,7 @@
 #include <QVector>
 #include <QWidget>
 
-#define _CONTROL_PLAYING_TIME_ 1
+//#define _CONTROL_PLAYING_TIME_ 1
 
 class QToolBar;
 class QDockWidget;
diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp
index 3e7c1a9..b68cd3b 100644
--- a/app/VideoSubWindow.cpp
+++ b/app/VideoSubWindow.cpp
@@ -634,7 +634,7 @@ void VideoSubWindow::disableModule( CalypAppModuleIf* pcModule )
     if( m_pcCurrentDisplayModule )
     {
       pcModule = m_pcCurrentDisplayModule;
-      m_pcCurrentDisplayModule = 0;
+      m_pcCurrentDisplayModule = NULL;
       ModulesHandle::destroyModuleIf( pcModule );
       setWindowName( QFileInfo( m_cFilename ).fileName() );
       bRefresh |= true;
diff --git a/lib/CalypFrame.cpp b/lib/CalypFrame.cpp
index 26431c7..fbab86c 100644
--- a/lib/CalypFrame.cpp
+++ b/lib/CalypFrame.cpp
@@ -388,16 +388,16 @@ unsigned int CalypFrame::getNumberChannels() const
   return d->m_pcPelFormat->numberChannels;
 }
 
-unsigned int CalypFrame::getWidth( int channel ) const
+unsigned CalypFrame::getWidth( unsigned channel ) const
 {
   return CHROMASHIFT( d->m_uiWidth, channel > 0 ? d->m_pcPelFormat->log2ChromaWidth : 0 );
 }
-unsigned int CalypFrame::getHeight( int channel ) const
+unsigned CalypFrame::getHeight( unsigned channel ) const
 {
   return CHROMASHIFT( d->m_uiHeight, channel > 0 ? d->m_pcPelFormat->log2ChromaHeight : 0 );
 }
 
-ClpULong CalypFrame::getPixels( int channel ) const
+ClpULong CalypFrame::getPixels( unsigned channel ) const
 {
   return getWidth( channel ) * getHeight( channel );
 }
@@ -855,7 +855,7 @@ int CalypFrame::getNumHistogramSegment()
   return d->m_uiHistoSegments;
 }
 
-unsigned int CalypFrame::getMinimumPelValue( int channel )
+unsigned int CalypFrame::getMinimumPelValue( unsigned channel )
 {
   if( !d->m_bHasHistogram )
     return 0;
@@ -887,7 +887,7 @@ unsigned int CalypFrame::getMinimumPelValue( int channel )
   return 0;
 }
 
-unsigned int CalypFrame::getMaximumPelValue( int channel )
+unsigned int CalypFrame::getMaximumPelValue( unsigned channel )
 {
   if( !d->m_bHasHistogram )
     return 0;
@@ -919,7 +919,7 @@ unsigned int CalypFrame::getMaximumPelValue( int channel )
   return 0;
 }
 
-unsigned int CalypFrame::getMaximum( int channel )
+unsigned int CalypFrame::getMaximum( unsigned channel )
 {
   if( !d->m_bHasHistogram )
     return 0;
@@ -952,7 +952,7 @@ unsigned int CalypFrame::getMaximum( int channel )
   return maxValue;
 }
 
-unsigned int CalypFrame::getNumPixelsRange( int channel, unsigned int start, unsigned int end )
+unsigned int CalypFrame::getNumPixelsRange( unsigned channel, unsigned int start, unsigned int end )
 {
   if( !d->m_bHasHistogram || start < 0 || end > d->m_uiHistoSegments - 1 || start > end )
   {
@@ -974,7 +974,7 @@ unsigned int CalypFrame::getNumPixelsRange( int channel, unsigned int start, uns
   return count;
 }
 
-double CalypFrame::getMean( int channel, unsigned int start, unsigned int end )
+double CalypFrame::getMean( unsigned channel, unsigned int start, unsigned int end )
 {
   if( !d->m_bHasHistogram || start < 0 || end > d->m_uiHistoSegments - 1 || start > end )
   {
@@ -1004,7 +1004,7 @@ double CalypFrame::getMean( int channel, unsigned int start, unsigned int end )
   return mean;
 }
 
-int CalypFrame::getMedian( int channel, unsigned int start, unsigned int end )
+int CalypFrame::getMedian( unsigned channel, unsigned int start, unsigned int end )
 {
   if( !d->m_bHasHistogram || start < 0 || end > d->m_uiHistoSegments - 1 || start > end )
   {
@@ -1030,7 +1030,7 @@ int CalypFrame::getMedian( int channel, unsigned int start, unsigned int end )
   return 0;
 }
 
-double CalypFrame::getStdDev( int channel, unsigned int start, unsigned int end )
+double CalypFrame::getStdDev( unsigned channel, unsigned int start, unsigned int end )
 {
   if( !d->m_bHasHistogram || start < 0 || end > d->m_uiHistoSegments - 1 || start > end )
   {
@@ -1069,7 +1069,7 @@ double CalypFrame::getStdDev( int channel, unsigned int start, unsigned int end
   return sqrt( ( dev - count * mean * mean ) / ( count - 1 ) );
 }
 
-double CalypFrame::getHistogramValue( int channel, unsigned int bin )
+double CalypFrame::getHistogramValue( unsigned channel, unsigned int bin )
 {
   if( !d->m_bHasHistogram || bin < 0 || bin > d->m_uiHistoSegments - 1 )
     return 0.0;
diff --git a/lib/CalypFrame.h b/lib/CalypFrame.h
index a155741..c6fe1b5 100644
--- a/lib/CalypFrame.h
+++ b/lib/CalypFrame.h
@@ -181,28 +181,28 @@ public:
 	 * Get the number of channels
 	 * @return number of channels
 	 */
-  unsigned int getNumberChannels() const;
+  unsigned getNumberChannels() const;
 
   /**
 	 * Get width of the frame
 	 * @param channel/component
 	 * @return number of pixels
 	 */
-  unsigned int getWidth( int channel = 0 ) const;
+  unsigned int getWidth( unsigned channel = 0 ) const;
 
   /**
 	 * Get height of the frame
 	 * @param channel/component
 	 * @return number of pixels
 	 */
-  unsigned int getHeight( int channel = 0 ) const;
+  unsigned int getHeight( unsigned channel = 0 ) const;
 
   /**
 	 * Get number of pixels of the frame
 	 * @param channel/component
 	 * @return number of pixels
 	 */
-  ClpULong getPixels( int channel = 0 ) const;
+  ClpULong getPixels( unsigned channel = 0 ) const;
 
   /**
    * Get the total number of pixels of the frame
@@ -352,15 +352,15 @@ public:
   };
   void calcHistogram();
 
-  unsigned int getMinimumPelValue( int channel );
-  unsigned int getMaximumPelValue( int channel );
+  unsigned int getMinimumPelValue( unsigned channel );
+  unsigned int getMaximumPelValue( unsigned channel );
 
-  unsigned int getMaximum( int channel );
-  unsigned int getNumPixelsRange( int channel, unsigned int start, unsigned int end );
-  double getMean( int channel, unsigned int start, unsigned int end );
-  int getMedian( int channel, unsigned int start, unsigned int end );
-  double getStdDev( int channel, unsigned int start, unsigned int end );
-  double getHistogramValue( int channel, unsigned int bin );
+  unsigned int getMaximum( unsigned channel );
+  unsigned int getNumPixelsRange( unsigned channel, unsigned int start, unsigned int end );
+  double getMean( unsigned channel, unsigned int start, unsigned int end );
+  int getMedian( unsigned channel, unsigned int start, unsigned int end );
+  double getStdDev( unsigned channel, unsigned int start, unsigned int end );
+  double getHistogramValue( unsigned channel, unsigned int bin );
   int getNumHistogramSegment();
 
   /**