Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
e876396a
Commit
e876396a
authored
Feb 21, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: deactivate the encryption functionnality until core or ts demux is ready.
parent
a9d5d43a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+3
-1
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+2
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+6
-1
modules/gui/qt4/main_interface.hpp
modules/gui/qt4/main_interface.hpp
+4
-0
No files found.
modules/gui/qt4/input_manager.cpp
View file @
e876396a
...
@@ -129,7 +129,6 @@ void InputManager::delInput()
...
@@ -129,7 +129,6 @@ void InputManager::delInput()
emit
statusChanged
(
END_S
);
emit
statusChanged
(
END_S
);
emit
teletextPossible
(
false
);
emit
teletextPossible
(
false
);
emit
encryptionChanged
(
false
);
emit
AtoBchanged
(
false
,
false
);
emit
AtoBchanged
(
false
,
false
);
emit
voutChanged
(
false
);
emit
voutChanged
(
false
);
emit
voutListChanged
(
NULL
,
0
);
emit
voutListChanged
(
NULL
,
0
);
...
@@ -138,6 +137,9 @@ void InputManager::delInput()
...
@@ -138,6 +137,9 @@ void InputManager::delInput()
emit
artChanged
(
NULL
);
emit
artChanged
(
NULL
);
emit
infoChanged
(
NULL
);
emit
infoChanged
(
NULL
);
emit
metaChanged
(
(
input_item_t
*
)
NULL
);
emit
metaChanged
(
(
input_item_t
*
)
NULL
);
#if 0
emit encryptionChanged( false );
#endif
}
}
/* Convert the event from the callbacks in actions */
/* Convert the event from the callbacks in actions */
...
...
modules/gui/qt4/input_manager.hpp
View file @
e876396a
...
@@ -192,7 +192,9 @@ signals:
...
@@ -192,7 +192,9 @@ signals:
void
synchroChanged
();
void
synchroChanged
();
void
bookmarksChanged
();
void
bookmarksChanged
();
void
cachingChanged
(
float
);
void
cachingChanged
(
float
);
#if 0
void encryptionChanged( bool );
void encryptionChanged( bool );
#endif
};
};
class
MainInputManager
:
public
QObject
class
MainInputManager
:
public
QObject
...
...
modules/gui/qt4/main_interface.cpp
View file @
e876396a
...
@@ -82,7 +82,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
...
@@ -82,7 +82,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
playlistVisible
=
false
;
playlistVisible
=
false
;
input_name
=
""
;
input_name
=
""
;
fullscreenControls
=
NULL
;
fullscreenControls
=
NULL
;
#if 0
cryptedLabel = NULL;
cryptedLabel = NULL;
#endif
/* Ask for privacy */
/* Ask for privacy */
askForPrivacy
();
askForPrivacy
();
...
@@ -349,10 +351,12 @@ inline void MainInterface::createStatusBar()
...
@@ -349,10 +351,12 @@ inline void MainInterface::createStatusBar()
- right-clicking and clicking just toggle between remaining and
- right-clicking and clicking just toggle between remaining and
elapsed time.*/
elapsed time.*/
CONNECT
(
timeLabel
,
timeLabelDoubleClicked
(),
THEDP
,
gotoTimeDialog
()
);
CONNECT
(
timeLabel
,
timeLabelDoubleClicked
(),
THEDP
,
gotoTimeDialog
()
);
#if 0
CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) );
CONNECT( THEMIM->getIM(), encryptionChanged( bool ) , this, showCryptedLabel( bool ) );
#endif
}
}
#if 0
void MainInterface::showCryptedLabel( bool )
void MainInterface::showCryptedLabel( bool )
{
{
if( cryptedLabel == NULL )
if( cryptedLabel == NULL )
...
@@ -364,6 +368,7 @@ void MainInterface::showCryptedLabel( bool )
...
@@ -364,6 +368,7 @@ void MainInterface::showCryptedLabel( bool )
cryptedLabel->show();
cryptedLabel->show();
}
}
#endif
inline
void
MainInterface
::
initSystray
()
inline
void
MainInterface
::
initSystray
()
{
{
...
...
modules/gui/qt4/main_interface.hpp
View file @
e876396a
...
@@ -141,7 +141,9 @@ private:
...
@@ -141,7 +141,9 @@ private:
/* Status Bar */
/* Status Bar */
QLabel
*
nameLabel
;
QLabel
*
nameLabel
;
#if 0
QLabel *cryptedLabel;
QLabel *cryptedLabel;
#endif
virtual
void
customEvent
(
QEvent
*
);
virtual
void
customEvent
(
QEvent
*
);
virtual
void
keyPressEvent
(
QKeyEvent
*
);
virtual
void
keyPressEvent
(
QKeyEvent
*
);
...
@@ -173,7 +175,9 @@ private slots:
...
@@ -173,7 +175,9 @@ private slots:
void
updateSystrayTooltipName
(
QString
);
void
updateSystrayTooltipName
(
QString
);
void
updateSystrayTooltipStatus
(
int
);
void
updateSystrayTooltipStatus
(
int
);
#if 0
void showCryptedLabel( bool );
void showCryptedLabel( bool );
#endif
signals:
signals:
void
askReleaseVideo
(
);
void
askReleaseVideo
(
);
void
askVideoToResize
(
unsigned
int
,
unsigned
int
);
void
askVideoToResize
(
unsigned
int
,
unsigned
int
);
...
...
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