--- a/videoplayback/hbvideoplaybackview/tsrc/testvideoplaybackcontrolscontroller/testmpxvideoplaybackcontrolscontroller.pro	Thu Apr 01 23:22:15 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/tsrc/testvideoplaybackcontrolscontroller/testmpxvideoplaybackcontrolscontroller.pro	Thu Apr 01 23:32:44 2010 +0300
@@ -14,7 +14,7 @@
 # Description: Project file for building testmpxvideoplaybackcontrolscontroller
 #
 #
-# Version : %version: 1 %
+# Version : %version: 2 %
 
 
 TEMPLATE = app
@@ -27,8 +27,7 @@
 
 INCLUDEPATH += stub/inc \
                ../inc \
-               ../../inc \   
-               ../../controlinc \
+               ../../inc \
                ../../../inc \            
                ../../../../inc \                                          
 
@@ -36,7 +35,7 @@
         
 # Input
 HEADERS += hbvideobaseplaybackview.h  \
-           mpxvideoplaybackbuttonbar.h \
+           mpxvideoplaybackcontrolbar.h \
            mpxvideoplaybackcontrolpolicy.h \
            mpxvideoplaybackcontrolconfiguration.h \
            mpxvideoplaybackdetailsplaybackwindow.h \
@@ -44,7 +43,6 @@
            mpxvideoplaybackfiledetailswidget.h \
            mpxvideoplaybackfullscreencontrol.h \
            mpxvideoplaybacknontouchvolumebar.h \
-           mpxvideoplaybackprogressbar.h \
            mpxvideoplaybackstatuspanecontrol.h \
            mpxvideoplaybackviewfiledetails.h \
            mpxvideoviewwrapper.h \
@@ -54,7 +52,7 @@
 					 
                
 SOURCES += hbvideobaseplaybackview.cpp \ 
-           mpxvideoplaybackbuttonbar.cpp \
+           mpxvideoplaybackcontrolbar.cpp \
            mpxvideoplaybackcontrolpolicy.cpp \
            mpxvideoplaybackcontrolconfiguration.cpp \
            mpxvideoplaybackdetailsplaybackwindow.cpp \
@@ -62,7 +60,6 @@
            mpxvideoplaybackfiledetailswidget.cpp \
            mpxvideoplaybackfullscreencontrol.cpp \
            mpxvideoplaybacknontouchvolumebar.cpp \
-           mpxvideoplaybackprogressbar.cpp \
            mpxvideoplaybackstatuspanecontrol.cpp \
            mpxvideoplaybackviewfiledetails.cpp \
            mpxvideoviewwrapper.cpp \