Navigation

Changeset 6db8acaa4945c84c4671c4aeece517ead6deee10

Timestamp:

22/12/07 10:31:50 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1198315910 +0000

git-parent:

[b3819c325757996d53e79d82ac3794b0409ef77d]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1198315910 +0000

Message:

Qt4 - Fix previous commit.

Files:

rf9ff5b6	r6db8aca
31	31	#include <vlc_streaming.h>
32	32
33		~~#include <iostream>~~
34	33	#include <QString>
35	34	#include <QFileDialog>
	35
	36	SoutDialog* SoutDialog::instance = NULL;
36	37
37	38	SoutDialog::SoutDialog( QWidget parent, intf_thread_t _p_intf,

rf9ff5b6	r6db8aca
40	40	Q_OBJECT;
41	41	public:
42		static SoutDialog * getInstance( QWidget *parent,
43		intf_thread_t *p_intf,
44		bool transcode_only )
	42	static SoutDialog* getInstance( QWidget parent, intf_thread_t p_intf,
	43	bool transcode_only )
45	44	{
46	45	if( !instance )
…	…
56	55	}
57	56	return instance;
58		};
	57	}
59	58
60		virtual ~SoutDialog();
	59	virtual ~SoutDialog(){}
61	60
62	61	QString getMrl(){ return mrl; }
63	62
64	63	private:
	64	Ui::Sout ui;
	65	static SoutDialog *instance;
65	66	SoutDialog( QWidget* parent, intf_thread_t *,
66	67	bool _transcode_only = false );
67		~~static SoutDialog *instance;~~
68
69		~~Ui::Sout ui;~~
70	68	QPushButton *okButton;
71	69	QString mrl;