diff options
Diffstat (limited to 'src')
44 files changed, 238 insertions, 273 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..a4228f6 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory( app ) +add_subdirectory( part ) diff --git a/src/FAQ b/src/FAQ deleted file mode 100644 index 5cefe5c..0000000 --- a/src/FAQ +++ /dev/null @@ -1,13 +0,0 @@ -================================================================================ -FAQ -================================================================================ -This FAQ regards the source code and its layout. - - -Q: Why reimplement code in the part rather than consolidate it with the app? -A: Mainly to make the application start faster, loading a part is not free. But - also to make the part start faster as it has much lower requirements. - I admit the maintainance consequences aren't pretty, but the part has very - little code, so theoretically it should be easy to keep bug fixes in sync. - -=========1=========2=========3=========4=========5=========6=========7=========8
\ No newline at end of file diff --git a/src/SConscript b/src/SConscript deleted file mode 100644 index 31c1933..0000000 --- a/src/SConscript +++ /dev/null @@ -1,21 +0,0 @@ - -############################ -## load the config - -## Use the environment and the tools set in the top-level -## SConstruct file (set with 'Export') - this is very important - -Import( '*' ) -myenv=env.Copy() - -myenv.SConscript( dirs = Split( "app part") ) - -KDEinstall( env['KDEDATA']+'/codeine', '../misc/codeineui.rc', myenv ) -KDEinstall( env['KDEDATA']+'/konqueror/servicemenus', '../misc/codeine_play_dvd.desktop', myenv ) -KDEinstall( env['KDESERV'], '../misc/codeine_part.desktop', myenv ) -KDEinstall( env['KDEXDG'], '../misc/codeine.desktop', myenv ) - -for size in ['16', '22', '32', '48', '64', '128']: - KDEinstallas( env['KDEICONS']+'/crystalsvg/'+size+'x'+size+'/apps/codeine.png', '../misc/cr'+size+'-app-codeine.png', myenv ) - -#print env['KDECXXFLAGS']
\ No newline at end of file diff --git a/src/TODO b/src/TODO deleted file mode 100644 index a8d427d..0000000 --- a/src/TODO +++ /dev/null @@ -1,38 +0,0 @@ -1.0.1
- Volume state saving
-
-1.0.x
- Improve error messages and error handling
- Consolidate error handling code in part and application so we don't diverge
- No audio icon in analyzer when no audio
- Playback finished message (amaroK statusbar code?)
- Mouse move to show toolbar in fullscreen mode
- People are likely to use "F" keyboard shortcut or escape after film ends in fullscreen mode
- but the popup of the menu prevents this, as for some reason Qt stops handling keyboard
- shortcuts. We need a solution. The escape issue makes the popup menu less useful. So
- escape with the menu should exit fullscreen too. All shortcuts in the menu should work.
- Shortcuts not in the menu shouldn't work as this is a modal menu! Could be dangerous.
- Consider adding quit to the fullscreen context menu always, or make the menubar show with
- toolbar when mouse moves.
- Add tooltips to PlayMedia dialog for recent file listview entries (directory info etc.)
- Show zoom percentage in statusbar/OSD when resizing window, snap to 100%?
- More feedback at playback end
- Better loading/buffering status/feedback
- Save prettyTitle with url and show that in recent file list,
- - save m3u's? <-- needs thought
- - mark remote files?
- Support .srt files like Kaffeine/xine-ui does, ask berkus if stuck.
- DVD fullscreen, DVD menu shows or something
-
-1.1
- Volume button (not there by default)
- Two entries in Konqueror: 1. open in new window 2. open in current window
- Play from begin scroll up popup when resuming playback
- Much better DVD support
- Show length information in normal window
- 'o' in fullscreen mode shows OSD of length and elapsed time info, <-- emulate mplayer
-
-ACTION
- xine config dialog is modal
-REACTION
- none, at least yet, it is far easier to maintain modal dialogs
\ No newline at end of file diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt new file mode 100644 index 0000000..60a21e4 --- /dev/null +++ b/src/app/CMakeLists.txt @@ -0,0 +1,54 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${XINE_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} + ${X11_XTEST_INCLUDE_DIRS} + ${X11_KEYSIM_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### codeine (executable) + +tde_add_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + xineEngine.cpp + xineConfig.cpp + xineScope.c + theStream.cpp + videoWindow.cpp + videoSettings.cpp + captureFrame.cpp + actions.cpp + stateChange.cpp + slider.cpp + analyzer.cpp + playDialog.cpp + listView.cpp + adjustSizeButton.cpp + fullScreenAction.cpp + insertAspectRatioMenuItems.cpp + playlistFile.cpp + volumeAction.cpp + ../mxcl.library.cpp + main.cpp + mainWindow.cpp + LINK + tdecore-shared + tdeui-shared + tdeio-shared + ${XINE_LIBRARIES} + ${X11_LIBRARIES} + ${X11_XTEST_LIBRARIES} + + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/src/app/SConscript b/src/app/SConscript deleted file mode 100644 index bb402f3..0000000 --- a/src/app/SConscript +++ /dev/null @@ -1,59 +0,0 @@ - -############################ -## load the config - -## Use the environment and the tools set in the top-level -## SConstruct file (set with 'Export') - this is very important - -Import( '*' ) -myenv=env.Copy() - -############################# -## the programs to build - -# we put the stuff that could fail due to bad xine.h locations, etc. at the beginning -# so if the build fails the user knows quickly -app_sources = Split(""" - xineEngine.cpp - xineConfig.cpp - xineScope.c - theStream.cpp - videoWindow.cpp - videoSettings.cpp - captureFrame.cpp - - actions.cpp - stateChange.cpp - slider.cpp - analyzer.cpp - playDialog.cpp - listView.cpp - adjustSizeButton.cpp - fullScreenAction.cpp - insertAspectRatioMenuItems.cpp - playlistFile.cpp - volumeAction.cpp - - ../mxcl.library.cpp - - main.cpp - mainWindow.cpp""") - -KDEprogram( "codeine", app_sources, myenv ) - - -############################ -## Customization - -## Additional include paths for compiling the source files -## Always add '../' (top-level directory) because moc makes code that needs it -KDEaddpaths( ['./', '../', '../../'], myenv ) - -## Necessary libraries to link against -KDEaddlibs( ['tqt-mt', 'tdeio', 'tdecore', 'tdeui', 'xine', 'Xtst'], myenv ) - -## This shows how to add other link flags to the program -myenv['LINKFLAGS'].append('-L/usr/X11R6/lib') - -## If you are using QThread, add this line -# myenv.AppendUnique( CPPFLAGS = ['-DQT_THREAD_SUPPORT'] ) diff --git a/src/app/actions.cpp b/src/app/actions.cpp index 1612a57..7447320 100644 --- a/src/app/actions.cpp +++ b/src/app/actions.cpp @@ -2,9 +2,9 @@ // See COPYING file for licensing information #include "actions.h" -#include "debug.h" -#include "mxcl.library.h" -#include <ntqtoolbutton.h> +#include "../debug.h" +#include "../mxcl.library.h" +#include <tqtoolbutton.h> #include "xineEngine.h" namespace Codeine diff --git a/src/app/adjustSizeButton.cpp b/src/app/adjustSizeButton.cpp index 3a5c1dd..e1bf5b1 100644 --- a/src/app/adjustSizeButton.cpp +++ b/src/app/adjustSizeButton.cpp @@ -4,11 +4,11 @@ #include "adjustSizeButton.h" #include "extern.h" #include <kpushbutton.h> -#include <ntqapplication.h> -#include <ntqevent.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqpainter.h> +#include <tqapplication.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> #include "theStream.h" #include "xineEngine.h" //videoWindow() diff --git a/src/app/adjustSizeButton.h b/src/app/adjustSizeButton.h index 9becd95..0dbe432 100644 --- a/src/app/adjustSizeButton.h +++ b/src/app/adjustSizeButton.h @@ -4,7 +4,7 @@ #ifndef CODEINE_ADJUST_SIZE_BUTTON_H #define CODEINE_ADJUST_SIZE_BUTTON_H -#include <ntqframe.h> +#include <tqframe.h> namespace Codeine { diff --git a/src/app/analyzer.cpp b/src/app/analyzer.cpp index 593bd16..9d3da06 100644 --- a/src/app/analyzer.cpp +++ b/src/app/analyzer.cpp @@ -2,10 +2,10 @@ // See COPYING file for licensing information #include "analyzer.h" -#include "codeine.h" -#include "debug.h" +#include "../codeine.h" +#include "../debug.h" #include <math.h> //interpolate() -#include <ntqevent.h> //event() +#include <tqevent.h> //event() #include "xineEngine.h" #include "fht.cpp" @@ -83,7 +83,7 @@ Analyzer::Base2D::resizeEvent( TQResizeEvent* ) // Author: Max Howell <max.howell@methylblue.com>, (C) 2003 // Copyright: See COPYING file that comes with this distribution -#include <ntqpainter.h> +#include <tqpainter.h> Analyzer::Block::Block( TQWidget *parent ) : Analyzer::Base2D( parent, 20 ) @@ -108,7 +108,7 @@ Analyzer::Block::transform( Analyzer::Scope &scope ) //pure virtual fht.scale( front, 1.0 / 40 ); } -#include <math.h> + void Analyzer::Block::analyze( const Analyzer::Scope &s ) { @@ -129,3 +129,5 @@ Analyzer::Block::heightForWidth( int w ) const { return w / 2; } + +#include "analyzer.moc" diff --git a/src/app/analyzer.h b/src/app/analyzer.h index edd526e..9a5af00 100644 --- a/src/app/analyzer.h +++ b/src/app/analyzer.h @@ -8,9 +8,9 @@ #include <sys/types.h>
#endif
-#include <ntqpixmap.h> //stack allocated and convenience
-#include <ntqtimer.h> //stack allocated
-#include <ntqwidget.h> //baseclass
+#include <tqpixmap.h> //stack allocated and convenience
+#include <tqtimer.h> //stack allocated
+#include <tqwidget.h> //baseclass
#include <vector> //included for convenience
namespace Analyzer
diff --git a/src/app/captureFrame.cpp b/src/app/captureFrame.cpp index 6043b76..3be0e9f 100644 --- a/src/app/captureFrame.cpp +++ b/src/app/captureFrame.cpp @@ -1,21 +1,21 @@ // (C) 2005 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information -#include "debug.h" +#include "../debug.h" #include <tdefiledialog.h> #include <kpreviewwidgetbase.h> #include <kpushbutton.h> #include <kstatusbar.h> #include <kstdguiitem.h> #include "mainWindow.h" -#include "mxcl.library.h" -#include <ntqdialog.h> -#include <ntqhbox.h> -#include <ntqlabel.h> -#include <ntqimage.h> -#include <ntqlayout.h> -#include <ntqpainter.h> -#include <ntqstringlist.h> +#include "../mxcl.library.h" +#include <tqdialog.h> +#include <tqhbox.h> +#include <tqlabel.h> +#include <tqimage.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstringlist.h> #include "theStream.h" #include "xineEngine.h" #include <xine.h> diff --git a/src/app/config.h b/src/app/codeineConfig.h index 4ac877c..4ac877c 100644 --- a/src/app/config.h +++ b/src/app/codeineConfig.h diff --git a/src/app/fullScreenAction.cpp b/src/app/fullScreenAction.cpp index 3787a33..006164d 100644 --- a/src/app/fullScreenAction.cpp +++ b/src/app/fullScreenAction.cpp @@ -5,7 +5,7 @@ #include "fullScreenAction.h" #include <tdelocale.h> #include <twin.h> -#include <ntqwidget.h> +#include <tqwidget.h> #include "xineEngine.h" //videoWindow() diff --git a/src/app/insertAspectRatioMenuItems.cpp b/src/app/insertAspectRatioMenuItems.cpp index 2e2824c..81ad0b3 100644 --- a/src/app/insertAspectRatioMenuItems.cpp +++ b/src/app/insertAspectRatioMenuItems.cpp @@ -1,7 +1,7 @@ // Copyright 2005 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <xine.h> TQString i18n( const char *text ); diff --git a/src/app/main.cpp b/src/app/main.cpp index a024d5d..299df88 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,7 +1,7 @@ // (c) 2004 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information -#include "codeine.h" +#include "../codeine.h" #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> @@ -13,8 +13,8 @@ static TDEAboutData aboutData( APP_NAME, I18N_NOOP(PRETTY_NAME), APP_VERSION, I18N_NOOP("A video player that has a usability focus"), TDEAboutData::License_GPL_V2, I18N_NOOP("Copyright 2006, Max Howell"), 0, - "http://www.methylblue.com/codeine/", - "codeine@methylblue.com" ); + "https://mirror.git.trinitydesktop.org/gitea/TDE/codeine", + 0 ); static const TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP( "Play 'URL'" ), 0 }, diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp index ac054ac..b31806b 100644 --- a/src/app/mainWindow.cpp +++ b/src/app/mainWindow.cpp @@ -1,12 +1,15 @@ // (C) 2005 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "actions.h" #include "analyzer.h" -#include "config.h" -#include "configure.h" +#include "codeineConfig.h" #include <cstdlib> -#include "debug.h" +#include "../debug.h" #include "extern.h" //dialog creation function definitions #include "fullScreenAction.h" #include <tdeapplication.h> @@ -23,13 +26,13 @@ #include "mainWindow.h" #include "playDialog.h" //::play() #include "playlistFile.h" -#include "mxcl.library.h" -#include <ntqcstring.h> -#include <ntqdesktopwidget.h> -#include <ntqevent.h> //::stateChanged() -#include <ntqlayout.h> //ctor -#include <ntqpopupmenu.h> //because XMLGUI is poorly designed -#include <ntqobjectlist.h> +#include "../mxcl.library.h" +#include <tqcstring.h> +#include <tqdesktopwidget.h> +#include <tqevent.h> //::stateChanged() +#include <tqlayout.h> //ctor +#include <tqpopupmenu.h> //because XMLGUI is poorly designed +#include <tqobjectlist.h> #include "slider.h" #include "theStream.h" #include "volumeAction.h" @@ -712,3 +715,5 @@ action( const char *name ) } } //namespace Codeine + +#include "mainWindow.moc" diff --git a/src/app/mainWindow.h b/src/app/mainWindow.h index a6c7d48..0b44d0c 100644 --- a/src/app/mainWindow.h +++ b/src/app/mainWindow.h @@ -4,7 +4,7 @@ #ifndef CODEINEMAINWINDOW_H #define CODEINEMAINWINDOW_H -#include "codeine.h" +#include "../codeine.h" #include <tdemainwindow.h> class KURL; diff --git a/src/app/playDialog.cpp b/src/app/playDialog.cpp index b6cacaa..ab650b9 100644 --- a/src/app/playDialog.cpp +++ b/src/app/playDialog.cpp @@ -1,7 +1,7 @@ // (C) 2005 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information -#include "config.h" +#include "codeineConfig.h" #include "listView.cpp" #include <tdeapplication.h> #include <tdeconfig.h> @@ -10,11 +10,11 @@ #include <kpushbutton.h> #include <kstdguiitem.h> #include "playDialog.h" -#include "mxcl.library.h" -#include <ntqfile.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqsignalmapper.h> +#include "../mxcl.library.h" +#include <tqfile.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqsignalmapper.h> TQString i18n( const char *text ); @@ -112,3 +112,5 @@ PlayDialog::done( TQListViewItem *item ) } } + +#include "playDialog.moc" diff --git a/src/app/playDialog.h b/src/app/playDialog.h index 2bbc37d..1c84e2d 100644 --- a/src/app/playDialog.h +++ b/src/app/playDialog.h @@ -5,7 +5,7 @@ #define CODEINEPLAYDIALOG_H #include <kurl.h> -#include <ntqdialog.h> +#include <tqdialog.h> class TDEListView; class TQBoxLayout; diff --git a/src/app/playlistFile.cpp b/src/app/playlistFile.cpp index 83b1f5d..d520fa2 100644 --- a/src/app/playlistFile.cpp +++ b/src/app/playlistFile.cpp @@ -5,13 +5,13 @@ //TODO error messages that vary depending on if the file is remote or not -#include "codeine.h" -#include "debug.h" +#include "../codeine.h" +#include "../debug.h" #include <tdeio/netaccess.h> #include "playlistFile.h" -#include <ntqfile.h> -#include <ntqtextstream.h> -#include <mxcl.library.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include "../mxcl.library.h" PlaylistFile::PlaylistFile( const KURL &url ) diff --git a/src/app/slider.cpp b/src/app/slider.cpp index 205a3b8..172c15d 100644 --- a/src/app/slider.cpp +++ b/src/app/slider.cpp @@ -1,14 +1,14 @@ // (c) 2004 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information -#include "debug.h" +#include "../debug.h" #include "slider.h" -#include <ntqapplication.h> -#include <ntqlabel.h> -#include <ntqsize.h> -#include <ntqtooltip.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqsize.h> +#include <tqtooltip.h> -#include <ntqpainter.h> +#include <tqpainter.h> #include "xineEngine.h" using Codeine::Slider; @@ -143,3 +143,5 @@ Slider::setValue( int newValue ) else m_prevValue = newValue; } + +#include "slider.moc" diff --git a/src/app/slider.h b/src/app/slider.h index b7cbae0..e739d72 100644 --- a/src/app/slider.h +++ b/src/app/slider.h @@ -4,7 +4,7 @@ #ifndef CODEINESLIDER_H #define CODEINESLIDER_H -#include <ntqslider.h> +#include <tqslider.h> namespace Codeine { diff --git a/src/app/stateChange.cpp b/src/app/stateChange.cpp index d547ff1..15846f5 100644 --- a/src/app/stateChange.cpp +++ b/src/app/stateChange.cpp @@ -3,16 +3,16 @@ #include "actions.h" #include "adjustSizeButton.h" -#include "debug.h" +#include "../debug.h" #include "mainWindow.h" #include <tdeconfig.h> #include <tdeglobal.h> -#include "mxcl.library.h" -#include <ntqapplication.h> -#include <ntqevent.h> -#include <ntqlabel.h> -#include <ntqpopupmenu.h> -#include <ntqslider.h> +#include "../mxcl.library.h" +#include <tqapplication.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqpopupmenu.h> +#include <tqslider.h> #include "theStream.h" #include "videoSettings.h" //FIXME unfortunate #include "xineEngine.h" diff --git a/src/app/theStream.cpp b/src/app/theStream.cpp index 246e84d..fbb35ac 100644 --- a/src/app/theStream.cpp +++ b/src/app/theStream.cpp @@ -2,7 +2,7 @@ // See COPYING file for licensing information #include <kurl.h> -#include "mxcl.library.h" +#include "../mxcl.library.h" #include "theStream.h" #include <xine.h> #include "xineEngine.h" diff --git a/src/app/theStream.h b/src/app/theStream.h index c71b5e8..7679a10 100644 --- a/src/app/theStream.h +++ b/src/app/theStream.h @@ -4,10 +4,10 @@ #ifndef CODEINE_THESTREAM_H
#define CODEINE_THESTREAM_H
-#include "config.h" // needed for inline functions
+#include "codeineConfig.h" // needed for inline functions
#include <kurl.h> // larger :( but no macros at least
-#include <ntqsize.h> // small header
-#include <ntqstring.h> // small header
+#include <tqsize.h> // small header
+#include <tqstring.h> // small header
/// for purely static classes
#define CODEINE_NO_EXPORT( T ) \
diff --git a/src/app/videoSettings.cpp b/src/app/videoSettings.cpp index 19323d8..cf759c2 100644 --- a/src/app/videoSettings.cpp +++ b/src/app/videoSettings.cpp @@ -2,10 +2,10 @@ // See COPYING file for licensing information #include <twin.h> -#include "mxcl.library.h" -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqslider.h> +#include "../mxcl.library.h" +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> #include "videoSettings.h" #include <xine.h> #include "xineEngine.h" diff --git a/src/app/videoSettings.h b/src/app/videoSettings.h index c781169..0568cde 100644 --- a/src/app/videoSettings.h +++ b/src/app/videoSettings.h @@ -4,7 +4,7 @@ #ifndef CODEINE_VIDEO_SETTINGS_H #define CODEINE_VIDEO_SETTINGS_H -#include "codeine.h" +#include "../codeine.h" #include <kdialog.h> diff --git a/src/app/videoWindow.cpp b/src/app/videoWindow.cpp index 0e7d19f..2ecf65a 100644 --- a/src/app/videoWindow.cpp +++ b/src/app/videoWindow.cpp @@ -6,15 +6,15 @@ #include "actions.h" #include <cmath> //std::log10 #include <cstdlib> -#include "debug.h" +#include "../debug.h" #include <tdeapplication.h> //::makeStandardCaption #include <tdeconfig.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <twin.h> -#include "mxcl.library.h" -#include <ntqcursor.h> -#include <ntqevent.h> +#include "../mxcl.library.h" +#include <tqcursor.h> +#include <tqevent.h> #include "slider.h" #include "theStream.h" #include <X11/Xlib.h> diff --git a/src/app/volumeAction.cpp b/src/app/volumeAction.cpp index f9a1951..0c0b81c 100644 --- a/src/app/volumeAction.cpp +++ b/src/app/volumeAction.cpp @@ -3,14 +3,14 @@ #include <tdelocale.h> #include <tdetoolbar.h> -#include <ntqevent.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqslider.h> +#include <tqevent.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> -#include "debug.h" +#include "../debug.h" #include "volumeAction.h" -#include "volumeAction.moc" + #include "xineEngine.h" @@ -112,3 +112,5 @@ VolumeAction::eventFilter( TQObject *o, TQEvent *e ) return false; } } + +#include "volumeAction.moc" diff --git a/src/app/xineConfig.cpp b/src/app/xineConfig.cpp index 07d402f..7be1c76 100644 --- a/src/app/xineConfig.cpp +++ b/src/app/xineConfig.cpp @@ -1,21 +1,21 @@ // (C) 2005 Max Howell (max.howell@methylblue.com) // See COPYING file for licensing information -#include "debug.h" +#include "../debug.h" #include <tdeapplication.h> // XineConfigDialog::ctor -> to get the iconloader #include <kcombobox.h> #include <kiconloader.h> // XineConfigDialog::ctor #include <klineedit.h> #include <kseparator.h> #include <kstdguiitem.h> -#include <ntqcheckbox.h> -#include <ntqlabel.h> -#include <ntqlayout.h> -#include <ntqscrollview.h> -#include <ntqspinbox.h> -#include <ntqtabwidget.h> -#include <ntqtooltip.h> -#include <ntqvbox.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqscrollview.h> +#include <tqspinbox.h> +#include <tqtabwidget.h> +#include <tqtooltip.h> +#include <tqvbox.h> #include <xine.h> #include "xineConfig.h" @@ -185,7 +185,7 @@ XineConfigDialog::isUnsavedSettings() const return false; } -#include <ntqdir.h> +#include <tqdir.h> void XineConfigDialog::saveSettings() { diff --git a/src/app/xineConfig.h b/src/app/xineConfig.h index 7eb9ab8..5dc05f2 100644 --- a/src/app/xineConfig.h +++ b/src/app/xineConfig.h @@ -5,7 +5,7 @@ #define XINECONFIG_H #include <kdialogbase.h> -#include <ntqptrlist.h> +#include <tqptrlist.h> class KComboBox; class KLineEdit; diff --git a/src/app/xineEngine.cpp b/src/app/xineEngine.cpp index 9a7b709..295d155 100644 --- a/src/app/xineEngine.cpp +++ b/src/app/xineEngine.cpp @@ -5,14 +5,14 @@ #include "actions.h" //::seek() FIXME unfortunate #include <cmath> //the fade out -#include "config.h" -#include "debug.h" +#include "codeineConfig.h" +#include "../debug.h" #include <limits> #include <tdelocale.h> -#include "mxcl.library.h" -#include <ntqapplication.h> //::sendEvent() -#include <ntqdatetime.h> //record() -#include <ntqdir.h> //::exists() +#include "../mxcl.library.h" +#include <tqapplication.h> //::sendEvent() +#include <tqdatetime.h> //record() +#include <tqdir.h> //::exists() #include "slider.h" #include "theStream.h" #include <xine.h> @@ -21,7 +21,6 @@ #include <unistd.h> #include <cstdlib> - #define XINE_SAFE_MODE 1 extern "C" { void _debug( const char *string ) { debug() << string; } } //FIXME @@ -876,3 +875,5 @@ VideoWindow::fileFilter() const } } //namespace Codeine + +#include "xineEngine.moc" diff --git a/src/app/xineEngine.h b/src/app/xineEngine.h index f1b49c3..57017ce 100644 --- a/src/app/xineEngine.h +++ b/src/app/xineEngine.h @@ -4,9 +4,9 @@ #ifndef CODEINE_VIDEOWINDOW_H #define CODEINE_VIDEOWINDOW_H -#include "codeine.h" -#include <ntqtimer.h> -#include <ntqwidget.h> +#include "../codeine.h" +#include <tqtimer.h> +#include <tqwidget.h> #include <kurl.h> #include <stdint.h> #include <vector> diff --git a/src/debug.h b/src/debug.h index 436cceb..9214083 100644 --- a/src/debug.h +++ b/src/debug.h @@ -6,8 +6,8 @@ #define CODEINE_DEBUG_H #include <kdebug.h> -#include <ntqcstring.h> -#include <ntqvariant.h> +#include <tqcstring.h> +#include <tqvariant.h> #include <sys/time.h> class TQApplication; ///@see Debug::Indent diff --git a/src/mxcl.library.cpp b/src/mxcl.library.cpp index 45c8ce4..786524a 100644 --- a/src/mxcl.library.cpp +++ b/src/mxcl.library.cpp @@ -2,7 +2,7 @@ // See COPYING file for licensing information #include "mxcl.library.h" -#include <ntqapplication.h> +#include <tqapplication.h> #include <kcursor.h> namespace mxcl diff --git a/src/mxcl.library.h b/src/mxcl.library.h index 57eca2c..78dc9c6 100644 --- a/src/mxcl.library.h +++ b/src/mxcl.library.h @@ -17,7 +17,7 @@ namespace mxcl /// almost always negates the need to #include <tdelocale.h> in implementations -#include <ntqstring.h> +#include <tqstring.h> TQString i18n( const char *text ); diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt new file mode 100644 index 0000000..d544001 --- /dev/null +++ b/src/part/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${XINE_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + + +##### codeine (shared) + +tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC + + SOURCES + part.cpp + xineEngine.cpp + videoWindow.cpp + toolbar.cpp + ../mxcl.library.cpp + LINK + tdecore-shared + tdeui-shared + tdeparts-shared + ${XINE_LIBRARIES} + ${X11_LIBRARIES} + + DESTINATION ${LIB_INSTALL_DIR} +) diff --git a/src/part/SConscript b/src/part/SConscript deleted file mode 100644 index ff2d085..0000000 --- a/src/part/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2005 Max Howell <max.howell@methylblue.com> - -Import( "*" ) -myenv=env.Copy() - -## Additional paths for compiling the source files -## Always add '../' (top-level directory) because moc makes code that needs it -KDEaddpaths( ['./', '../', '../../'], myenv ) - -KDEaddlibs( ['tqt-mt', 'tdecore', 'tdeui', 'tdeparts', 'xine'], myenv ) - -KDEshlib( "libcodeine", Split( "part.cpp xineEngine.cpp videoWindow.cpp toolbar.cpp ../mxcl.library.cpp" ), myenv ) diff --git a/src/part/part.cpp b/src/part/part.cpp index f251731..6490e67 100644 --- a/src/part/part.cpp +++ b/src/part/part.cpp @@ -1,17 +1,17 @@ // Author: Max Howell <max.howell@methylblue.com>, (C) 2005
// Copyright: See COPYING file that comes with this distribution
-#include "codeine.h"
-#include "debug.h"
+#include "../codeine.h"
+#include "../debug.h"
#include <tdeaboutdata.h>
#include <tdeparts/genericfactory.h>
#include "part.h"
-#include <ntqtimer.h>
+#include <tqtimer.h>
#include "toolbar.h"
#include "videoWindow.h"
#include <tdeaction.h>
-#include <ntqslider.h>
+#include <tqslider.h>
namespace Codeine
{
diff --git a/src/part/toolbar.cpp b/src/part/toolbar.cpp index 87caa62..cdf85c3 100644 --- a/src/part/toolbar.cpp +++ b/src/part/toolbar.cpp @@ -2,8 +2,8 @@ // See COPYING file for licensing information #include <kpushbutton.h> -#include <ntqapplication.h> -#include <ntqevent.h> +#include <tqapplication.h> +#include <tqevent.h> #include "toolbar.h" @@ -41,4 +41,4 @@ MouseOverToolBar::eventFilter( TQObject *o, TQEvent *e ) } return false; -}
\ No newline at end of file +} diff --git a/src/part/videoWindow.cpp b/src/part/videoWindow.cpp index 53cd0dd..79d09ae 100644 --- a/src/part/videoWindow.cpp +++ b/src/part/videoWindow.cpp @@ -4,10 +4,10 @@ #define CODEINE_DEBUG_PREFIX "videoWindow" #include <cstdlib> -#include "debug.h" -#include <ntqapplication.h> //sendEvent() -#include <ntqcursor.h> -#include <ntqevent.h> +#include "../debug.h" +#include <tqapplication.h> //sendEvent() +#include <tqcursor.h> +#include <tqevent.h> #include "videoWindow.h" #include <X11/Xlib.h> //TODO this breaks compile for lots of people due to excessive macro content #include <xine.h> //x11_visual_t diff --git a/src/part/videoWindow.h b/src/part/videoWindow.h index 0d0e4d5..76d2b6c 100644 --- a/src/part/videoWindow.h +++ b/src/part/videoWindow.h @@ -5,8 +5,8 @@ #define CODEINE_VIDEO_WINDOW_H #include "../codeine.h" -#include <ntqtimer.h> -#include <ntqwidget.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kurl.h> typedef struct xine_s xine_t; diff --git a/src/part/xineEngine.cpp b/src/part/xineEngine.cpp index 8424f37..5069e40 100644 --- a/src/part/xineEngine.cpp +++ b/src/part/xineEngine.cpp @@ -3,13 +3,13 @@ #define CODEINE_DEBUG_PREFIX "engine" -#include "debug.h" +#include "../debug.h" #include <tdeglobalsettings.h> #include <tdelocale.h> -#include "mxcl.library.h" -#include <ntqapplication.h> //::sendEvent() -#include <ntqdatetime.h> //::play() -#include <ntqdir.h> //TQDir::homeDir() +#include "../mxcl.library.h" +#include <tqapplication.h> //::sendEvent() +#include <tqdatetime.h> //::play() +#include <tqdir.h> //TQDir::homeDir() #include <xine.h> #include "videoWindow.h" @@ -343,3 +343,5 @@ VideoWindow::xineEventListener( void *p, const xine_event_t* xineEvent ) } } //namespace Codeine + +#include "videoWindow.moc" |