SVN commit 593058 by vriezen:
>From trunc/extragear/multimedia/kmplayer
A kmplayer (directory) trunk/extragear/multimedia/kmplayer#586491
A kmplayer/ChangeLog
trunk/extragear/multimedia/kmplayer/ChangeLog#586512
A kmplayer/TODO trunk/extragear/multimedia/kmplayer/TODO#586512
A kmplayer/configure.in.in
trunk/extragear/multimedia/kmplayer/configure.in.in#586512
M +36 -32 kmplayer/debian/control
M +3 -144 kmplayer/debian/rules
A kmplayer/kmplayer.lsm
trunk/extragear/multimedia/kmplayer/kmplayer.lsm#586512
M +29 -23 kmplayer/src/kmplayer_part.cpp
A kmplayer/src/kmplayerpartbase.cpp
trunk/extragear/multimedia/kmplayer/src/kmplayerpartbase.cpp#592780
A kmplayer/src/kmplayerprocess.cpp
trunk/extragear/multimedia/kmplayer/src/kmplayerprocess.cpp#592037
A kmplayer/src/kmplayersource.h
trunk/extragear/multimedia/kmplayer/src/kmplayersource.h#592037
A kmplayer/src/kmplayertvsource.cpp
trunk/extragear/multimedia/kmplayer/src/kmplayertvsource.cpp#592037
--- branches/work/kde4/extragear/multimedia/kmplayer/debian/control
#586491:593058
@@ -1,45 +1,49 @@
Source: kmplayer
Section: kde
Priority: optional
-Maintainer: Koos Vriezen <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), kdelibs4-dev, libxine-dev,
libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
-Standards-Version: 3.6.0
+Maintainer: Koos Vriezen <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 5.0.0), cdbs, kdelibs4-dev, libxine-dev,
libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev
+Standards-Version: 3.6.2
Package: kmplayer
-Architecture: all
-Section: sound
-Depends: kmplayer-lib (>= ${Source-Version}), kmplayer-app (>=
${Source-Version}), kmplayer-plugin (>= ${Source-Version})
-Description: KMPlayer metapackage
+Architecture: any
+Section: kde
+Depends: kmplayer-base (= ${Source-Version})
+Recommends: kmplayer-konq-plugins (= ${Source-Version})
+Suggests: kmplayer-doc (= ${Source-Version})
+Description: media player for KDE
+ A basic audio/video viewer application for KDE.
+ .
+ Homepage: http://kmplayer.kde.org
-Package: kmplayer-lib
+Package: kmplayer-base
Architecture: any
-Section: sound
+Section: kde
Depends: ${shlibs:Depends}
-Description: KMPlayer shared library
+Description: Base files for KMPlayer
+ Core files needed for KMPlayer.
+ .
+ Homepage: http://kmplayer.kde.org
-Package: kmplayer-app
+Package: kmplayer-konq-plugins
Architecture: any
-Section: sound
-Depends: kmplayer-lib (= ${Source-Version})
-Description: KMPlayer stand-alone application
- Basic audio/video viewer application for KDE.
-
-Package: kmplayer-plugin
-Architecture: any
-Section: sound
-Depends: kmplayer-lib (= ${Source-Version})
-Description: KMPlayer plugin for khtml/konqueror
- This plugin enables audio/video playback inside konqueror, such as
+Section: kde
+Depends: kmplayer-base (= ${Source-Version}), konqueror
+Description: KMPlayer plugin for KHTML/Konqueror
+ This plugin enables audio/video playback inside Konqueror, such as
movie trailers, web tv or radio.
+ .
+ The KMPlayer KPart plugin for Konqueror mimics QuickTime, MS Media Player and
+ RealPlayer plugin browser plugins.
+ .
+ Homepage: http://kmplayer.kde.org
-Package: kmplayer-i18n
-Architecture: any
-Section: sound
-Depends: kmplayer-lib (= ${Source-Version})
-Description: All internationalized (i18n) files for KMPlayer.
+Package: kmplayer-doc
+Architecture: all
+Section: kde
+Depends:
+Description: Handbook for KMPlayer
+ Documention for KMPlayer, a basic audio/video viewer application for KDE.
+ .
+ Homepage: http://kmplayer.kde.org
-Package: kmplayer-doc
-Architecture: any
-Section: sound
-Depends: kmplayer-app (= ${Source-Version})
-Description: Handbook for KMPlayer.
--- branches/work/kde4/extragear/multimedia/kmplayer/debian/rules #586491:593058
@@ -1,146 +1,5 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
-configure-stamp:
- dh_testdir
- # make build directory
- mkdir $(objdir)
- # Add here commands to configure the package.
- cd $(objdir) && \
- CFLAGS="$(CFLAGS)" ../configure $(configkde)
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final
- touch configure-stamp
-
-
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- # Add here commands to compile the arch part of the package.
- cd $(objdir) && \
- $(MAKE)
- touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
- touch build-indep-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
-
- # Add here commands to clean up after the build process.
- rm -rf $(objdir)
- rm -f configure-stamp
- -$(MAKE) -i distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
-
- # Add here commands to install the indep part of the package into
- # debian/<package>-doc.
- #INSTALLDOC#
-
- dh_install -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- cd $(objdir) && \
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -Xindex.docbook
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps -ldebian/tmp/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/kde.mk
--- branches/work/kde4/extragear/multimedia/kmplayer/src/kmplayer_part.cpp
#586491:593058
@@ -128,6 +128,9 @@
value.lower() != QString::fromLatin1("0"));
}
+#define SET_FEAT_ON(f) { m_features |= f; turned_off_features &= ~f; }
+#define SET_FEAT_OFF(f) { m_features &= ~f; turned_off_features |= f; }
+
KDE_NO_CDTOR_EXPORT KMPlayerPart::KMPlayerPart (QWidget * wparent, const char
*wname,
QObject * parent, const char *name, const QStringList
&args)
: PartBase (wparent, wname, parent, name, new KSimpleConfig ("kmplayerrc")),
@@ -183,20 +186,20 @@
for (QStringList::const_iterator i = sl.begin (); i != e; ++i)
{
QString val_lower ((*i).lower ());
if (val_lower == QString::fromLatin1("imagewindow")) {
- m_features |= Feat_Viewer;
+ SET_FEAT_ON (Feat_Viewer)
} else if (val_lower == QString::fromLatin1("all")) {
m_features = (Feat_Controls | Feat_StatusBar);
} else if (val_lower == QString::fromLatin1("tacctrl")) {
- m_features |= Feat_Label;
+ SET_FEAT_ON (Feat_Label)
} else if (val_lower ==
QString::fromLatin1("controlpanel")) {
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if (val_lower ==
QString::fromLatin1("infovolumepanel")){
- m_features |= Feat_Controls; // TODO
+ SET_FEAT_ON (Feat_Controls) // TODO
} else if (val_lower ==
QString::fromLatin1("positionfield") ||
val_lower ==
QString::fromLatin1("positionslider")) {
setAutoControls (false);
panel->positionSlider ()->show ();
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if ( val_lower == QString::fromLatin1("homectrl")) {
setAutoControls (false);
panel->button
(KMPlayer::ControlPanel::button_config)->show();
@@ -205,11 +208,11 @@
setAutoControls (false);
panel->volumeBar()->setMinimumSize (QSize (20,
panel->volumeBar()->minimumSize ().height ()));
panel->volumeBar()->show ();
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if (val_lower == QString::fromLatin1("rwctrl")) {
setAutoControls (false);
panel->button
(KMPlayer::ControlPanel::button_back)->show (); // rewind ?
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if ( val_lower == QString::fromLatin1("ffctrl")) {
setAutoControls (false);
panel->button(KMPlayer::ControlPanel::button_forward)->show();
@@ -217,25 +220,25 @@
} else if ( val_lower ==QString::fromLatin1("stopbutton"))
{
setAutoControls (false);
panel->button
(KMPlayer::ControlPanel::button_stop)->show ();
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if (val_lower == QString::fromLatin1("playbutton")
||
val_lower ==QString::fromLatin1("playonlybutton"))
{
setAutoControls (false);
panel->button
(KMPlayer::ControlPanel::button_play)->show ();
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if (val_lower ==QString::fromLatin1("pausebutton"))
{
setAutoControls (false);
panel->button
(KMPlayer::ControlPanel::button_pause)->show ();
- m_features |= Feat_Controls;
+ SET_FEAT_ON (Feat_Controls)
} else if (val_lower == QString::fromLatin1("statusbar") ||
val_lower == QString::fromLatin1("statusfield")) {
- m_features |= Feat_StatusBar;
+ SET_FEAT_ON (Feat_StatusBar)
} else if (val_lower == QString::fromLatin1("infopanel")) {
- m_features |= Feat_InfoPanel;
+ SET_FEAT_ON (Feat_InfoPanel)
} else if (val_lower == QString::fromLatin1("playlist")) {
- m_features |= Feat_PlayList;
+ SET_FEAT_ON (Feat_PlayList)
} else if (val_lower==QString::fromLatin1("volumeslider"))
{
- m_features |= Feat_VolumeSlider;
+ SET_FEAT_ON (Feat_VolumeSlider)
setAutoControls (false);
panel->volumeBar()->show ();
panel->volumeBar()->setMinimumSize (QSize (20,
panel->volumeBar()->minimumSize ().height ()));
@@ -244,28 +247,28 @@
} else if (name == QString::fromLatin1("uimode")) {
QString val_lower (value.lower ());
if (val_lower == QString::fromLatin1("full"))
- m_features |= (Feat_All & ~Feat_PlayList);
+ SET_FEAT_ON (Feat_All & ~Feat_PlayList)
// TODO: invisible, none, mini
} else if (name == QString::fromLatin1("nolabels")) {
- turned_off_features |= Feat_Label;
+ SET_FEAT_OFF (Feat_Label)
} else if (name == QString::fromLatin1("nocontrols")) {
- turned_off_features |= (Feat_Controls | Feat_VolumeSlider);
+ SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider)
} else if (name == QString::fromLatin1("showdisplay")) {
// the author name, the clip name, and the copyright
information
if (getBoolValue (value))
- m_features |= Feat_InfoPanel;
+ SET_FEAT_ON (Feat_InfoPanel)
else
- turned_off_features |= Feat_InfoPanel;
+ SET_FEAT_OFF (Feat_InfoPanel)
} else if (name == QString::fromLatin1("showcontrols")) {
if (getBoolValue (value))
- m_features |= (Feat_Viewer | Feat_Controls);
+ SET_FEAT_ON (Feat_Viewer | Feat_Controls)
else
- turned_off_features |= (Feat_Controls | Feat_VolumeSlider);
+ SET_FEAT_OFF (Feat_Controls | Feat_VolumeSlider)
} else if (name == QString::fromLatin1("showstatusbar")) {
if (getBoolValue (value))
- m_features |= (Feat_Viewer | Feat_StatusBar);
+ SET_FEAT_ON (Feat_Viewer | Feat_StatusBar)
else
- turned_off_features |= Feat_StatusBar;
+ SET_FEAT_OFF (Feat_StatusBar)
// else showcaptioning/showgotobar/showpositioncontrols/showtracker
} else if (name == QString::fromLatin1("console")) {
m_group = value.isEmpty() ? QString::fromLatin1("_anonymous")
: value;
@@ -348,6 +351,9 @@
m_view->fullScreen ();
}
+#undef SET_FEAT_ON
+#undef SET_FEAT_OFF
+
KDE_NO_CDTOR_EXPORT KMPlayerPart::~KMPlayerPart () {
kdDebug() << "KMPlayerPart::~KMPlayerPart" << endl;
//if (!m_group.isEmpty ()) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
