cosmetic changes + compilation fixes

parent 8a473ffa
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
TOUI = ui/input_stats ui/main_interface ui/file_open \ TOUI = ui/input_stats ui/main_interface ui/file_open \
ui/okcanceldialog ui/okcanceldialog
UIH = $(TOUI:%=%.h) UIH = $(TOUI:%=%.h)
TOMOC = main_interface \ TOMOC = main_interface \
...@@ -22,13 +22,13 @@ TOMOC = main_interface \ ...@@ -22,13 +22,13 @@ TOMOC = main_interface \
dialogs/playlist \ dialogs/playlist \
dialogs/prefs_dialog \ dialogs/prefs_dialog \
dialogs/streaminfo \ dialogs/streaminfo \
dialogs/interaction \ dialogs/interaction \
components/infopanels \ components/infopanels \
components/preferences_widgets \ components/preferences_widgets \
components/preferences \ components/preferences \
components/open \ components/open \
components/video_widget \
components/playlist/panels \ components/playlist/panels \
components/video_widget \
util/input_slider util/input_slider
MOCCPP = $(TOMOC:%=%.moc.cpp) MOCCPP = $(TOMOC:%=%.moc.cpp)
...@@ -45,10 +45,10 @@ nodist_SOURCES_qt4 = \ ...@@ -45,10 +45,10 @@ nodist_SOURCES_qt4 = \
components/preferences_widgets.moc.cpp \ components/preferences_widgets.moc.cpp \
components/preferences.moc.cpp \ components/preferences.moc.cpp \
components/open.moc.cpp \ components/open.moc.cpp \
components/video_widget.moc.cpp \
components/playlist/panels.moc.cpp \ components/playlist/panels.moc.cpp \
components/video_widget.moc.cpp \
util/input_slider.moc.cpp \ util/input_slider.moc.cpp \
resources.cpp resources.cpp
if ENABLE_QT4 if ENABLE_QT4
BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4) BUILT_SOURCES += $(UIH) $(nodist_SOURCES_qt4)
...@@ -82,8 +82,8 @@ SOURCES_qt4 = qt4.cpp \ ...@@ -82,8 +82,8 @@ SOURCES_qt4 = qt4.cpp \
components/preferences_widgets.cpp \ components/preferences_widgets.cpp \
components/preferences.cpp \ components/preferences.cpp \
components/open.cpp \ components/open.cpp \
components/video_widget.cpp \
components/playlist/standardpanel.cpp \ components/playlist/standardpanel.cpp \
components/video_widget.cpp \
util/input_slider.cpp util/input_slider.cpp
$(NULL) $(NULL)
...@@ -102,8 +102,8 @@ EXTRA_DIST += \ ...@@ -102,8 +102,8 @@ EXTRA_DIST += \
components/preferences_widgets.hpp \ components/preferences_widgets.hpp \
components/preferences.hpp \ components/preferences.hpp \
components/open.hpp \ components/open.hpp \
components/video_widget.hpp \
components/playlist/panels.hpp \ components/playlist/panels.hpp \
components/video_widget.hpp \
util/input_slider.hpp \ util/input_slider.hpp \
ui/input_stats.ui \ ui/input_stats.ui \
ui/file_open.ui \ ui/file_open.ui \
......
...@@ -154,7 +154,7 @@ void VideoWidget::Release( void *p_win ) ...@@ -154,7 +154,7 @@ void VideoWidget::Release( void *p_win )
// p_intf->p_sys->p_mi->setMinimumSize( 500, // p_intf->p_sys->p_mi->setMinimumSize( 500,
// p_intf->p_sys->p_mi->addSize.height() ); // p_intf->p_sys->p_mi->addSize.height() );
if( !config_GetIntf( p_intf, "qt-always-video" ) ) if( !config_GetInt( p_intf, "qt-always-video" ) )
need_update = true; need_update = true;
fprintf( stderr, "[After R update] MI constraints %ix%i -> %ix%i\n", fprintf( stderr, "[After R update] MI constraints %ix%i -> %ix%i\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment