Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
6226d062
Commit
6226d062
authored
Feb 16, 2004
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Swap duration and group columns
* Introduce duration sort
parent
dbaaa2cb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
modules/gui/wxwindows/playlist.cpp
modules/gui/wxwindows/playlist.cpp
+18
-6
modules/gui/wxwindows/wxwindows.h
modules/gui/wxwindows/wxwindows.h
+2
-1
No files found.
modules/gui/wxwindows/playlist.cpp
View file @
6226d062
...
...
@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2004 VideoLAN
* $Id: playlist.cpp,v 1.4
0 2004/01/29 17:51:08
zorglub Exp $
* $Id: playlist.cpp,v 1.4
1 2004/02/16 17:14:39
zorglub Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
...
...
@@ -176,6 +176,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
i_title_sorted
=
0
;
i_author_sorted
=
0
;
i_group_sorted
=
0
;
i_duration_sorted
=
0
;
var_Create
(
p_intf
,
"random"
,
VLC_VAR_BOOL
|
VLC_VAR_DOINHERIT
);
...
...
@@ -283,8 +284,8 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
wxLC_REPORT
|
wxSUNKEN_BORDER
);
listview
->
InsertColumn
(
0
,
wxU
(
_
(
"Name"
))
);
listview
->
InsertColumn
(
1
,
wxU
(
_
(
"Author"
))
);
listview
->
InsertColumn
(
2
,
wxU
(
_
(
"
Group
"
))
);
listview
->
InsertColumn
(
3
,
wxU
(
_
(
"
Duration
"
))
);
listview
->
InsertColumn
(
2
,
wxU
(
_
(
"
Duration
"
))
);
listview
->
InsertColumn
(
3
,
wxU
(
_
(
"
Group
"
))
);
listview
->
SetColumnWidth
(
0
,
270
);
listview
->
SetColumnWidth
(
1
,
150
);
listview
->
SetColumnWidth
(
2
,
80
);
...
...
@@ -424,7 +425,7 @@ void Playlist::UpdateItem( int i )
_
(
"General"
)
,
_
(
"Author"
)
)
)
);
char
*
psz_group
=
playlist_FindGroup
(
p_playlist
,
p_item
->
i_group
);
listview
->
SetItem
(
i
,
2
,
listview
->
SetItem
(
i
,
3
,
wxL2U
(
psz_group
?
psz_group
:
_
(
"Normal"
)
)
);
if
(
p_item
->
b_enabled
==
VLC_FALSE
)
...
...
@@ -439,7 +440,7 @@ void Playlist::UpdateItem( int i )
mtime_t
dur
=
p_item
->
i_duration
;
if
(
dur
!=
-
1
)
secstotimestr
(
psz_duration
,
dur
/
1000000
);
else
memcpy
(
psz_duration
,
"-:--:--"
,
sizeof
(
"-:--:--"
)
);
listview
->
SetItem
(
i
,
3
,
wxU
(
psz_duration
)
);
listview
->
SetItem
(
i
,
2
,
wxU
(
psz_duration
)
);
/* Change the colour for the currenty played stream */
wxListItem
listitem
;
...
...
@@ -794,6 +795,18 @@ void Playlist::OnColSelect( wxListEvent& event )
}
break
;
case
2
:
if
(
i_duration_sorted
!=
1
)
{
playlist_Sort
(
p_playlist
,
SORT_DURATION
,
ORDER_NORMAL
);
i_duration_sorted
=
1
;
}
else
{
playlist_Sort
(
p_playlist
,
SORT_DURATION
,
ORDER_REVERSE
);
i_duration_sorted
=
-
1
;
}
break
;
case
3
:
if
(
i_group_sorted
!=
1
)
{
playlist_SortGroup
(
p_playlist
,
ORDER_NORMAL
);
...
...
@@ -1180,7 +1193,6 @@ int ItemChanged( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
)
{
Playlist
*
p_playlist_dialog
=
(
Playlist
*
)
param
;
fprintf
(
stderr
,
"Update item: %i
\n
"
,
new_val
.
i_int
);
p_playlist_dialog
->
UpdateItem
(
new_val
.
i_int
);
return
0
;
}
...
...
modules/gui/wxwindows/wxwindows.h
View file @
6226d062
...
...
@@ -2,7 +2,7 @@
* wxwindows.h: private wxWindows interface description
*****************************************************************************
* Copyright (C) 1999-2004 VideoLAN
* $Id: wxwindows.h,v 1.8
8 2004/01/26 22:10:20 gbazin
Exp $
* $Id: wxwindows.h,v 1.8
9 2004/02/16 17:14:39 zorglub
Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -819,6 +819,7 @@ private:
int
i_title_sorted
;
int
i_author_sorted
;
int
i_group_sorted
;
int
i_duration_sorted
;
};
...
...
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