Attachment #87331 for bug #122835

View | Details | Raw Unified | Return to bug 122835
Collapse All | Expand All




    connect (m_broadcastconfig, SIGNAL (broadcastStopped()), this, SLOT (broadcastStopped()));
    initStatusBar();
    m_player->init (actionCollection ());
    m_player->players () ["xvideo"] = new XVideo(m_player,m_player->settings());
    m_player->setProcess (MPLAYER_BIN);
    m_player->setRecorder ("mencoder");
    m_player->sources () ["dvdsource"] = new ::KMPlayerDVDSource(this, m_dvdmenu);
    m_player->sources () ["dvdnavsource"] = new KMPlayerDVDNavSource (this, m_dvdnavmenu);
    m_player->sources () ["vcdsource"] = new KMPlayerVCDSource(this, m_vcdmenu);

        return true;
    if (m_identified)
        return false;
    //kdDebug () << "scanning " << cstr << endl;
    QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
    QRegExp & langRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdlang];
    QRegExp & subtitleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdsub];
    QRegExp & titleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdtitle];
    QRegExp & chapterRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdchapter];

        return true;
    if (m_identified)
        return false;
    //kdDebug () << "scanning " << cstr << endl;
    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
    QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_vcdtrack];
    if (trackRegExp.search (str) > -1) {
        if (m_document->state != KMPlayer::Element::state_deferred)
            m_document->defer ();

Lines 117-125 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayerconfig.cpp (-1 / +1 lines)
117	// configdialog should be destroyed when the view is destroyed	117	// configdialog should be destroyed when the view is destroyed
118	//delete configdialog;	118	//delete configdialog;
119	}	119	}
120		120
121	KDE_EXPORT const char * strMPlayerGroup = "MPlayer";	121	KDE_EXPORT const char * strMPlayerGroup = MPLAYER_BIN;
122	const char * strGeneralGroup = "General Options";	122	const char * strGeneralGroup = "General Options";
123	static const char * strKeepSizeRatio = "Keep Size Ratio";	123	static const char * strKeepSizeRatio = "Keep Size Ratio";
124	static const char * strRememberSize = "Remember Size";	124	static const char * strRememberSize = "Remember Size";
125	static const char * strAutoResize = "Auto Resize";	125	static const char * strAutoResize = "Auto Resize";

Lines 55-60 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayer_def.h (-1 / +1 lines)
55	#define KMPLAYER_EXPORT	55	#define KMPLAYER_EXPORT
56	#define KMPLAYER_NO_EXPORT	56	#define KMPLAYER_NO_EXPORT
57	#endif	57	#endif
58		58
59		59	#define MPLAYER_BIN "mplayer-bin"
60	#endif //_KMPLAYER_DEF_H_	60	#endif //_KMPLAYER_DEF_H_

Lines 119-127 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayerpartbase.cpp (-1 / +1 lines)
119	m_auto_controls (true),	119	m_auto_controls (true),
120	m_bPosSliderPressed (false),	120	m_bPosSliderPressed (false),
121	m_in_update_tree (false)	121	m_in_update_tree (false)
122	{	122	{
123	m_players ["mplayer"] = new MPlayer (this, m_settings);	123	m_players [MPLAYER_BIN] = new MPlayer (this, m_settings);
124	Xine * xine = new Xine (this, m_settings);	124	Xine * xine = new Xine (this, m_settings);
125	m_players ["xine"] = xine;	125	m_players ["xine"] = xine;
126	m_players ["gstreamer"] = new GStreamer (this, m_settings);	126	m_players ["gstreamer"] = new GStreamer (this, m_settings);
127	m_recorders ["mencoder"] = new MEncoder (this, m_settings);	127	m_recorders ["mencoder"] = new MEncoder (this, m_settings);




    }
    bool group_member = !m_group.isEmpty () && m_group != QString::fromLatin1("_unique") && m_features != Feat_Unknown;
    if (!group_member || m_features & Feat_Viewer) {
        // not part of a group or we're the viewer
        setProcess (MPLAYER_BIN);
        setRecorder ("mencoder");
        connectPanel (m_view->controlPanel ());
        if (m_features & Feat_StatusBar) {
            last_time_left = 0;

                i = std::find_if (++i, e, pred)) {
            // found viewer and control part, exchange players now
            KMPlayerPart * vp = (m_features & Feat_Viewer) ? this : *i;
            KMPlayerPart * cp = (m_features & Feat_Viewer) ? *i : this;
            setProcess (MPLAYER_BIN);
            cp->connectToPart (vp);
        }
    } else
        m_group.truncate (0);

        QTimer::singleShot (0, this, SLOT (finished ()));
        return;
    }
    init ();
    m_player->setProcess (MPLAYER_BIN);
    if (m_player->process ()->grabPicture (m_url, 0))
        connect (m_player->process (), SIGNAL (grabReady (const QString &)),
                 this, SLOT (grabReady (const QString &)));
    else {




    "dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", 0L
};

KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (QObject * parent, Settings * settings)
 : MPlayerBase (parent, settings, MPLAYER_BIN),
   m_widget (0L),
   m_configpage (new MPlayerPreferencesPage (this)),
   aid (-1), sid (-1),
   m_needs_restarted (false) {

    if (!m_use_slave) {
        fprintf (stderr, "%s | ", pipe);
        *m_process << pipe << " | ";
    }
    fprintf (stderr, "mplayer-bin -wid %lu ", (unsigned long) widget ());
    *m_process << "mplayer-bin -wid " << QString::number (widget ());

    if (m_use_slave) {
        fprintf (stderr, "-slave ");
        *m_process << "-slave ";

    QString outdir = locateLocal ("data", "kmplayer/");
    m_grabfile = outdir + QString ("00000001.jpg");
    unlink (m_grabfile.ascii ());
    QString myurl (url.isLocalFile () ? getPath (url) : url.url ());
    QString args ("mplayer-bin ");
    if (m_settings->mplayerpost090)
        args += "-vo jpeg:outdir=";
    else
        args += "-vo jpeg -jpeg outdir=";


KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (QString & item, QString & icon, QString & tab) {
    item = i18n ("General Options");
    icon = QString ("kmplayer");
    tab = i18n (MPLAYER_BIN);
}

KDE_NO_EXPORT QFrame * MPlayerPreferencesPage::prefPage (QWidget * parent) {
    m_configframe = new MPlayerPreferencesFrame (parent);

    QString args;
    m_use_slave = m_source->pipeCmd ().isEmpty ();
    if (!m_use_slave)
        args = m_source->pipeCmd () + QString (" | ");
    args += QString ("mplayer-bin ") + m_source->recordCmd ();
    // FIXME if (m_player->source () == source) // ugly
    //    m_player->stop ();
    QString myurl = url.isLocalFile () ? getPath (url) : url.url ();
    bool post090 = m_settings->mplayerpost090;

Lines 702-710 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayertvsource.cpp (-1 / +1 lines)
702	QString args;	702	QString args;
703	args.sprintf ("tv:// -tv driver=%s:device=%s -identify -frames 0", m_driver.ascii (), m_tvdevice->src.ascii ());	703	args.sprintf ("tv:// -tv driver=%s:device=%s -identify -frames 0", m_driver.ascii (), m_tvdevice->src.ascii ());
704	m_tvsource->player ()->stop ();	704	m_tvsource->player ()->stop ();
705	m_tvsource->player ()->process ()->initProcess (m_player->settings ()->defaultView ()->viewer ());	705	m_tvsource->player ()->process ()->initProcess (m_player->settings ()->defaultView ()->viewer ());
706	KMPlayer::Process *proc = m_tvsource->player ()->players () ["mplayer"];	706	KMPlayer::Process *proc = m_tvsource->player ()->players () [MPLAYER_BIN];
707	proc->setSource (this);	707	proc->setSource (this);
708	if (!static_cast <KMPlayer::MPlayer *> (proc)->run (args.ascii()))	708	if (!static_cast <KMPlayer::MPlayer *> (proc)->run (args.ascii()))
709	deactivate ();	709	deactivate ();
710	}	710	}

Return to bug 122835

Lines 312-320 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayer_part.cpp (-3 / +3 lines)
312	}	312	}
313	bool group_member = !m_group.isEmpty () && m_group != QString::fromLatin1("_unique") && m_features != Feat_Unknown;	313	bool group_member = !m_group.isEmpty () && m_group != QString::fromLatin1("_unique") && m_features != Feat_Unknown;
314	if (!group_member \|\| m_features & Feat_Viewer) {	314	if (!group_member \|\| m_features & Feat_Viewer) {
315	// not part of a group or we're the viewer	315	// not part of a group or we're the viewer
316	setProcess ("mplayer");	316	setProcess (MPLAYER_BIN);
317	setRecorder ("mencoder");	317	setRecorder ("mencoder");
318	connectPanel (m_view->controlPanel ());	318	connectPanel (m_view->controlPanel ());
319	if (m_features & Feat_StatusBar) {	319	if (m_features & Feat_StatusBar) {
320	last_time_left = 0;	320	last_time_left = 0;
Lines 332-340 Link Here
332	i = std::find_if (++i, e, pred)) {	332	i = std::find_if (++i, e, pred)) {
333	// found viewer and control part, exchange players now	333	// found viewer and control part, exchange players now
334	KMPlayerPart * vp = (m_features & Feat_Viewer) ? this : *i;	334	KMPlayerPart * vp = (m_features & Feat_Viewer) ? this : *i;
335	KMPlayerPart * cp = (m_features & Feat_Viewer) ? *i : this;	335	KMPlayerPart * cp = (m_features & Feat_Viewer) ? *i : this;
336	setProcess ("mplayer");	336	setProcess (MPLAYER_BIN);
337	cp->connectToPart (vp);	337	cp->connectToPart (vp);
338	}	338	}
339	} else	339	} else
340	m_group.truncate (0);	340	m_group.truncate (0);
Lines 1074-1082 Link Here
1074	QTimer::singleShot (0, this, SLOT (finished ()));	1074	QTimer::singleShot (0, this, SLOT (finished ()));
1075	return;	1075	return;
1076	}	1076	}
1077	init ();	1077	init ();
1078	m_player->setProcess ("mplayer");	1078	m_player->setProcess (MPLAYER_BIN);
1079	if (m_player->process ()->grabPicture (m_url, 0))	1079	if (m_player->process ()->grabPicture (m_url, 0))
1080	connect (m_player->process (), SIGNAL (grabReady (const QString &)),	1080	connect (m_player->process (), SIGNAL (grabReady (const QString &)),
1081	this, SLOT (grabReady (const QString &)));	1081	this, SLOT (grabReady (const QString &)));
1082	else {	1082	else {

Lines 345-353 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayerprocess.cpp (-6 / +6 lines)
345	"dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", 0L	345	"dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", 0L
346	};	346	};
347		347
348	KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (QObject * parent, Settings * settings)	348	KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (QObject * parent, Settings * settings)
349	: MPlayerBase (parent, settings, "mplayer"),	349	: MPlayerBase (parent, settings, MPLAYER_BIN),
350	m_widget (0L),	350	m_widget (0L),
351	m_configpage (new MPlayerPreferencesPage (this)),	351	m_configpage (new MPlayerPreferencesPage (this)),
352	aid (-1), sid (-1),	352	aid (-1), sid (-1),
353	m_needs_restarted (false) {	353	m_needs_restarted (false) {
Lines 511-520 Link Here
511	if (!m_use_slave) {	511	if (!m_use_slave) {
512	fprintf (stderr, "%s \| ", pipe);	512	fprintf (stderr, "%s \| ", pipe);
513	*m_process << pipe << " \| ";	513	*m_process << pipe << " \| ";
514	}	514	}
515	fprintf (stderr, "mplayer -wid %lu ", (unsigned long) widget ());	515	fprintf (stderr, "mplayer-bin -wid %lu ", (unsigned long) widget ());
516	*m_process << "mplayer -wid " << QString::number (widget ());	516	*m_process << "mplayer-bin -wid " << QString::number (widget ());
517		517
518	if (m_use_slave) {	518	if (m_use_slave) {
519	fprintf (stderr, "-slave ");	519	fprintf (stderr, "-slave ");
520	*m_process << "-slave ";	520	*m_process << "-slave ";
Lines 599-607 Link Here
599	QString outdir = locateLocal ("data", "kmplayer/");	599	QString outdir = locateLocal ("data", "kmplayer/");
600	m_grabfile = outdir + QString ("00000001.jpg");	600	m_grabfile = outdir + QString ("00000001.jpg");
601	unlink (m_grabfile.ascii ());	601	unlink (m_grabfile.ascii ());
602	QString myurl (url.isLocalFile () ? getPath (url) : url.url ());	602	QString myurl (url.isLocalFile () ? getPath (url) : url.url ());
603	QString args ("mplayer ");	603	QString args ("mplayer-bin ");
604	if (m_settings->mplayerpost090)	604	if (m_settings->mplayerpost090)
605	args += "-vo jpeg:outdir=";	605	args += "-vo jpeg:outdir=";
606	else	606	else
607	args += "-vo jpeg -jpeg outdir=";	607	args += "-vo jpeg -jpeg outdir=";
Lines 920-928 Link Here
920		920
921	KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (QString & item, QString & icon, QString & tab) {	921	KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (QString & item, QString & icon, QString & tab) {
922	item = i18n ("General Options");	922	item = i18n ("General Options");
923	icon = QString ("kmplayer");	923	icon = QString ("kmplayer");
924	tab = i18n ("MPlayer");	924	tab = i18n (MPLAYER_BIN);
925	}	925	}
926		926
927	KDE_NO_EXPORT QFrame * MPlayerPreferencesPage::prefPage (QWidget * parent) {	927	KDE_NO_EXPORT QFrame * MPlayerPreferencesPage::prefPage (QWidget * parent) {
928	m_configframe = new MPlayerPreferencesFrame (parent);	928	m_configframe = new MPlayerPreferencesFrame (parent);
Lines 1020-1028 Link Here
1020	QString args;	1020	QString args;
1021	m_use_slave = m_source->pipeCmd ().isEmpty ();	1021	m_use_slave = m_source->pipeCmd ().isEmpty ();
1022	if (!m_use_slave)	1022	if (!m_use_slave)
1023	args = m_source->pipeCmd () + QString (" \| ");	1023	args = m_source->pipeCmd () + QString (" \| ");
1024	args += QString ("mplayer ") + m_source->recordCmd ();	1024	args += QString ("mplayer-bin ") + m_source->recordCmd ();
1025	// FIXME if (m_player->source () == source) // ugly	1025	// FIXME if (m_player->source () == source) // ugly
1026	// m_player->stop ();	1026	// m_player->stop ();
1027	QString myurl = url.isLocalFile () ? getPath (url) : url.url ();	1027	QString myurl = url.isLocalFile () ? getPath (url) : url.url ();
1028	bool post090 = m_settings->mplayerpost090;	1028	bool post090 = m_settings->mplayerpost090;

Lines 97-105 Link Here

(-)kmplayer-0.9.2-orig/src/kmplayerapp.cpp (-3 / +3 lines)
97	connect (m_broadcastconfig, SIGNAL (broadcastStopped()), this, SLOT (broadcastStopped()));	97	connect (m_broadcastconfig, SIGNAL (broadcastStopped()), this, SLOT (broadcastStopped()));
98	initStatusBar();	98	initStatusBar();
99	m_player->init (actionCollection ());	99	m_player->init (actionCollection ());
100	m_player->players () ["xvideo"] = new XVideo(m_player,m_player->settings());	100	m_player->players () ["xvideo"] = new XVideo(m_player,m_player->settings());
101	m_player->setProcess ("mplayer");	101	m_player->setProcess (MPLAYER_BIN);
102	m_player->setRecorder ("mencoder");	102	m_player->setRecorder ("mencoder");
103	m_player->sources () ["dvdsource"] = new ::KMPlayerDVDSource(this, m_dvdmenu);	103	m_player->sources () ["dvdsource"] = new ::KMPlayerDVDSource(this, m_dvdmenu);
104	m_player->sources () ["dvdnavsource"] = new KMPlayerDVDNavSource (this, m_dvdnavmenu);	104	m_player->sources () ["dvdnavsource"] = new KMPlayerDVDNavSource (this, m_dvdnavmenu);
105	m_player->sources () ["vcdsource"] = new KMPlayerVCDSource(this, m_vcdmenu);	105	m_player->sources () ["vcdsource"] = new KMPlayerVCDSource(this, m_vcdmenu);
Lines 1032-1040 Link Here
1032	return true;	1032	return true;
1033	if (m_identified)	1033	if (m_identified)
1034	return false;	1034	return false;
1035	//kdDebug () << "scanning " << cstr << endl;	1035	//kdDebug () << "scanning " << cstr << endl;
1036	QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;	1036	QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
1037	QRegExp & langRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdlang];	1037	QRegExp & langRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdlang];
1038	QRegExp & subtitleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdsub];	1038	QRegExp & subtitleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdsub];
1039	QRegExp & titleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdtitle];	1039	QRegExp & titleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdtitle];
1040	QRegExp & chapterRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdchapter];	1040	QRegExp & chapterRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdchapter];
Lines 1335-1343 Link Here
1335	return true;	1335	return true;
1336	if (m_identified)	1336	if (m_identified)
1337	return false;	1337	return false;
1338	//kdDebug () << "scanning " << cstr << endl;	1338	//kdDebug () << "scanning " << cstr << endl;
1339	QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;	1339	QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
1340	QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_vcdtrack];	1340	QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_vcdtrack];
1341	if (trackRegExp.search (str) > -1) {	1341	if (trackRegExp.search (str) > -1) {
1342	if (m_document->state != KMPlayer::Element::state_deferred)	1342	if (m_document->state != KMPlayer::Element::state_deferred)
1343	m_document->defer ();	1343	m_document->defer ();