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
c6edf8d8
Commit
c6edf8d8
authored
Jun 07, 2004
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* all: don't use input_OffsetToTime anymore.
parent
427b44e2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
35 deletions
+38
-35
modules/gui/gtk/display.c
modules/gui/gtk/display.c
+6
-5
modules/gui/kde/interface.cpp
modules/gui/kde/interface.cpp
+4
-6
modules/gui/pda/pda.c
modules/gui/pda/pda.c
+5
-4
modules/gui/qt/intf.cpp
modules/gui/qt/intf.cpp
+5
-5
modules/gui/skins/src/skin_main.cpp
modules/gui/skins/src/skin_main.cpp
+11
-5
modules/gui/skins2/vars/playlist.cpp
modules/gui/skins2/vars/playlist.cpp
+1
-0
modules/gui/wxwindows/interface.cpp
modules/gui/wxwindows/interface.cpp
+6
-10
No files found.
modules/gui/gtk/display.c
View file @
c6edf8d8
...
...
@@ -2,7 +2,7 @@
* display.c: Gtk+ tools for main interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2003 VideoLAN
* $Id
: display.c,v 1.12 2003/12/03 13:27:51 rocky Exp
$
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
...
...
@@ -62,13 +62,14 @@ void E_(GtkDisplayDate)( GtkAdjustment *p_adj )
if
(
p_intf
->
p_sys
->
p_input
)
{
#define p_area p_intf->p_sys->p_input->stream.p_selected_area
char
psz_time
[
MSTRTIME_MAX_SIZE
];
int64_t
i_seconds
;
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"time"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_time
,
i_seconds
);
gtk_frame_set_label
(
GTK_FRAME
(
p_intf
->
p_sys
->
p_slider_frame
),
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
psz_time
,
(
p_area
->
i_size
*
p_adj
->
value
)
/
100
)
);
#undef p_area
psz_time
);
}
}
...
...
modules/gui/kde/interface.cpp
View file @
c6edf8d8
...
...
@@ -502,14 +502,12 @@ void KInterface::slotSliderChanged( int position )
if
(
p_intf
->
p_sys
->
p_input
!=
NULL
)
{
char
psz_time
[
MSTRTIME_MAX_SIZE
];
int64_t
i_seconds
;
vlc_mutex_lock
(
&
p_intf
->
p_sys
->
p_input
->
stream
.
stream_lock
);
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"time"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_time
,
i_seconds
);
#define p_area p_intf->p_sys->p_input->stream.p_selected_area
statusBar
()
->
changeItem
(
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
psz_time
,
(
p_area
->
i_size
*
position
)
/
10000
),
ID_DATE
);
#undef p_area
vlc_mutex_unlock
(
&
p_intf
->
p_sys
->
p_input
->
stream
.
stream_lock
);
statusBar
()
->
changeItem
(
psz_time
,
ID_DATE
);
}
}
...
...
modules/gui/pda/pda.c
View file @
c6edf8d8
...
...
@@ -558,13 +558,14 @@ void E_(GtkDisplayDate)( GtkAdjustment *p_adj, gpointer userdata )
if
(
p_intf
->
p_sys
->
p_input
)
{
#define p_area p_intf->p_sys->p_input->stream.p_selected_area
char
psz_time
[
MSTRTIME_MAX_SIZE
];
int64_t
i_seconds
;
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"time"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_time
,
i_seconds
);
gtk_label_set_text
(
GTK_LABEL
(
p_intf
->
p_sys
->
p_slider_label
),
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
psz_time
,
(
p_area
->
i_size
*
p_adj
->
value
)
/
100
)
);
#undef p_area
psz_time
);
}
}
...
...
modules/gui/qt/intf.cpp
View file @
c6edf8d8
...
...
@@ -265,12 +265,12 @@ void IntfWindow::DateDisplay( int i_range )
if
(
p_intf
->
p_sys
->
p_input
)
{
char
psz_time
[
MSTRTIME_MAX_SIZE
];
int64_t
i_seconds
;
vlc_mutex_lock
(
&
p_intf
->
p_sys
->
p_input
->
stream
.
stream_lock
);
p_date
->
setText
(
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
psz_time
,
(
p_intf
->
p_sys
->
p_input
->
stream
.
p_selected_area
->
i_size
*
i_range
)
/
SLIDER_MAX
)
);
vlc_mutex_unlock
(
&
p_intf
->
p_sys
->
p_input
->
stream
.
stream_lock
);
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"time"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_time
,
i_seconds
);
p_date
->
setText
(
psz_time
);
}
}
...
...
modules/gui/skins/src/skin_main.cpp
View file @
c6edf8d8
...
...
@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id
: skin_main.cpp,v 1.55 2003/12/22 02:24:52 sam Exp
$
* $Id$
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -383,20 +383,26 @@ int SkinManage( intf_thread_t *p_intf )
// Text char * for updating text controls
char
*
text
=
new
char
[
MSTRTIME_MAX_SIZE
];
int64_t
i_seconds
,
i_length
;
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"time"
)
/
I64C
(
1000000
);
i_length
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"length"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_time
,
i_seconds
);
// Create end time text
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
&
text
[
1
],
p_area
->
i_size
-
p_area
->
i_tell
);
secstotimestr
(
&
text
[
1
],
i_length
-
i_seconds
);
text
[
0
]
=
'-'
;
p_intf
->
p_sys
->
p_theme
->
EvtBank
->
Get
(
"left_time"
)
->
PostTextMessage
(
text
);
// Create time text and update
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
text
,
p_area
->
i_tell
);
secstotimestr
(
text
,
i_seconds
);
p_intf
->
p_sys
->
p_theme
->
EvtBank
->
Get
(
"time"
)
->
PostTextMessage
(
text
);
// Create total time text
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
text
,
p_area
->
i_size
);
secstotimestr
(
text
,
i_length
);
p_intf
->
p_sys
->
p_theme
->
EvtBank
->
Get
(
"total_time"
)
->
PostTextMessage
(
text
);
...
...
modules/gui/skins2/vars/playlist.cpp
View file @
c6edf8d8
...
...
@@ -31,6 +31,7 @@
#include "playlist.hpp"
#include "../utils/ustring.hpp"
#define ICONV_CONST
Playlist
::
Playlist
(
intf_thread_t
*
pIntf
)
:
VarList
(
pIntf
)
{
...
...
modules/gui/wxwindows/interface.cpp
View file @
c6edf8d8
...
...
@@ -1230,21 +1230,17 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
if
(
p_intf
->
p_sys
->
p_input
)
{
/* Update stream date */
#define p_area p_intf->p_sys->p_input->stream.p_selected_area
char
psz_time
[
MSTRTIME_MAX_SIZE
],
psz_total
[
MSTRTIME_MAX_SIZE
];
mtime_t
i_seconds
;
vlc_value_t
val
;
var_Get
(
p_intf
->
p_sys
->
p_input
,
"length"
,
&
val
);
i_seconds
=
val
.
i_time
/
1000000
;
secstotimestr
(
psz_total
,
i_seconds
);
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"length"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_total
,
i_seconds
);
statusbar
->
SetStatusText
(
wxU
(
input_OffsetToTime
(
p_intf
->
p_sys
->
p_input
,
psz_time
,
p_area
->
i_size
*
event
.
GetPosition
()
/
SLIDER_MAX_POS
))
+
wxString
(
wxT
(
" / "
))
+
wxU
(
psz_total
),
0
);
#undef p_area
i_seconds
=
var_GetTime
(
p_intf
->
p_sys
->
p_input
,
"time"
)
/
I64C
(
1000000
);
secstotimestr
(
psz_time
,
i_seconds
);
statusbar
->
SetStatusText
(
wxU
(
psz_time
)
+
wxString
(
wxT
(
" / "
))
+
wxU
(
psz_total
),
0
);
}
}
#endif
...
...
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