Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
6b7e4a81
Commit
6b7e4a81
authored
Mar 14, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: correctly handle cancelling of sout/convert dialogs. Update copyrights.
parent
9544d246
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
11 deletions
+26
-11
modules/gui/qt4/components/sout/sout_widgets.cpp
modules/gui/qt4/components/sout/sout_widgets.cpp
+4
-1
modules/gui/qt4/dialogs/convert.cpp
modules/gui/qt4/dialogs/convert.cpp
+2
-1
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+1
-5
modules/gui/qt4/dialogs_provider.cpp
modules/gui/qt4/dialogs_provider.cpp
+19
-4
No files found.
modules/gui/qt4/components/sout/sout_widgets.cpp
View file @
6b7e4a81
/*****************************************************************************
/*****************************************************************************
* profile_selector.cpp : A small profile selector and editor
* profile_selector.cpp : A small profile selector and editor
****************************************************************************
****************************************************************************
* Copyright (C) 2009 the VideoLAN team
* Copyright (C) 2007-2009 the VideoLAN team
* Copyright (C) 2007 Société des arts technologiques
* Copyright (C) 2007 Savoir-faire Linux
* $Id$
* $Id$
*
*
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
* Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
...
...
modules/gui/qt4/dialogs/convert.cpp
View file @
6b7e4a81
...
@@ -112,7 +112,7 @@ void ConvertDialog::fileBrowse()
...
@@ -112,7 +112,7 @@ void ConvertDialog::fileBrowse()
void
ConvertDialog
::
cancel
()
void
ConvertDialog
::
cancel
()
{
{
hide
();
reject
();
}
}
void
ConvertDialog
::
close
()
void
ConvertDialog
::
close
()
...
@@ -131,4 +131,5 @@ void ConvertDialog::close()
...
@@ -131,4 +131,5 @@ void ConvertDialog::close()
",dst='"
+
fileLine
->
text
()
+
"'}"
;
",dst='"
+
fileLine
->
text
()
+
"'}"
;
msg_Dbg
(
p_intf
,
"Transcode MRL: %s"
,
qtu
(
mrl
)
);
msg_Dbg
(
p_intf
,
"Transcode MRL: %s"
,
qtu
(
mrl
)
);
accept
();
}
}
modules/gui/qt4/dialogs/sout.cpp
View file @
6b7e4a81
/*****************************************************************************
/*****************************************************************************
* sout.cpp : Stream output dialog ( old-style )
* sout.cpp : Stream output dialog ( old-style )
****************************************************************************
****************************************************************************
* Copyright (C) 2007-2008 the VideoLAN team
* Copyright (C) 2007-2009 the VideoLAN team
* Copyright (C) 2007 Société des arts technologiques
* Copyright (C) 2007 Savoir-faire Linux
*
*
* $Id$
* $Id$
*
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
* Jean-François Massol <jf.massol -at- gmail.com>
* Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
*
*
* This program is free software; you can redistribute it and/or modify
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
...
...
modules/gui/qt4/dialogs_provider.cpp
View file @
6b7e4a81
...
@@ -574,13 +574,28 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
...
@@ -574,13 +574,28 @@ void DialogsProvider::streamingDialog( QWidget *parent, QString mrl,
{
{
SoutDialog
*
s
=
SoutDialog
::
getInstance
(
parent
,
p_intf
,
mrl
);
SoutDialog
*
s
=
SoutDialog
::
getInstance
(
parent
,
p_intf
,
mrl
);
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
psz_option
=
qtu
(
s
->
getMrl
()
);
{
}
else
{
psz_option
=
strdup
(
qtu
(
s
->
getMrl
()
)
);
delete
s
;
}
else
{
delete
s
;
return
;
}
}
else
{
ConvertDialog
*
s
=
new
ConvertDialog
(
parent
,
p_intf
,
mrl
);
ConvertDialog
*
s
=
new
ConvertDialog
(
parent
,
p_intf
,
mrl
);
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
if
(
s
->
exec
()
==
QDialog
::
Accepted
)
psz_option
=
qtu
(
s
->
getMrl
()
);
{
psz_option
=
strdup
(
qtu
(
s
->
getMrl
()
)
);
delete
s
;
}
else
{
delete
s
;
return
;
}
}
}
if
(
!
EMPTY_STR
(
psz_option
)
)
if
(
!
EMPTY_STR
(
psz_option
)
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment