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
e15abb61
Commit
e15abb61
authored
May 21, 2009
by
JP Dinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics: make indentation less inconsistent.
parent
d032b62b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
40 deletions
+34
-40
modules/access/vcdx/access.c
modules/access/vcdx/access.c
+34
-40
No files found.
modules/access/vcdx/access.c
View file @
e15abb61
...
@@ -20,9 +20,9 @@
...
@@ -20,9 +20,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License
along
*
along with this program; if not, write to the Free Software
*
with this program; if not, write to the Free Software Foundation, Inc.,
*
Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
*****************************************************************************/
/*****************************************************************************
/*****************************************************************************
...
@@ -38,7 +38,6 @@
...
@@ -38,7 +38,6 @@
#include <vlc_input.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_access.h>
#include <vlc_charset.h>
#include <vlc_charset.h>
#include "vlc_keys.h"
#include <cdio/cdio.h>
#include <cdio/cdio.h>
#include <cdio/cd_types.h>
#include <cdio/cd_types.h>
...
@@ -223,19 +222,17 @@ VCDReadBlock( access_t * p_access )
...
@@ -223,19 +222,17 @@ VCDReadBlock( access_t * p_access )
/* Update seekpoint */
/* Update seekpoint */
if
(
VCDINFO_ITEM_TYPE_ENTRY
==
p_vcdplayer
->
play_item
.
type
)
if
(
VCDINFO_ITEM_TYPE_ENTRY
==
p_vcdplayer
->
play_item
.
type
)
{
{
unsigned
in
t
i_entry
=
p_vcdplayer
->
play_item
.
num
+
1
;
size_
t
i_entry
=
p_vcdplayer
->
play_item
.
num
+
1
;
lsn_t
i_lsn
=
vcdinfo_get_entry_lsn
(
p_vcdplayer
->
vcd
,
i_entry
);
lsn_t
i_lsn
=
vcdinfo_get_entry_lsn
(
p_vcdplayer
->
vcd
,
i_entry
);
if
(
p_vcdplayer
->
i_lsn
>=
i_lsn
&&
i_lsn
!=
VCDINFO_NULL_LSN
)
if
(
p_vcdplayer
->
i_lsn
>=
i_lsn
&&
i_lsn
!=
VCDINFO_NULL_LSN
)
{
{
const
track_t
i_track
=
p_vcdplayer
->
i_track
;
dbg_print
(
(
INPUT_DBG_LSN
|
INPUT_DBG_PBC
),
dbg_print
(
(
INPUT_DBG_LSN
|
INPUT_DBG_PBC
),
"entry change to %d, current LSN %u >= end %u"
,
"entry change to %d, current LSN %u >= end %u"
,
i_entry
,
p_vcdplayer
->
i_lsn
,
i_lsn
);
i_entry
,
p_vcdplayer
->
i_lsn
,
i_lsn
);
p_vcdplayer
->
play_item
.
num
=
i_entry
;
p_vcdplayer
->
play_item
.
num
=
i_entry
;
VCDSetOrigin
(
p_access
,
i_lsn
,
i_track
,
VCDSetOrigin
(
p_access
,
i_lsn
,
p_vcdplayer
->
i_track
,
&
(
p_vcdplayer
->
play_item
)
);
&
(
p_vcdplayer
->
play_item
)
);
}
}
}
}
...
@@ -471,11 +468,9 @@ VCDTitles( access_t * p_access )
...
@@ -471,11 +468,9 @@ VCDTitles( access_t * p_access )
vlc_input_title_New
();
vlc_input_title_New
();
char
psz_track
[
80
];
char
psz_track
[
80
];
snprintf
(
psz_track
,
sizeof
(
psz_track
),
"%s %02d"
,
_
(
"Track"
),
snprintf
(
psz_track
,
sizeof
(
psz_track
),
"%s %02d"
,
_
(
"Track"
),
i
);
i
);
t
->
i_size
=
(
int64_t
)
vcdinfo_get_track_size
(
p_vcdplayer
->
vcd
,
t
->
i_size
=
(
int64_t
)
vcdinfo_get_track_size
(
p_vcdplayer
->
vcd
,
i
)
i
)
*
M2F2_SECTOR_SIZE
/
CDIO_CD_FRAMESIZE
;
*
M2F2_SECTOR_SIZE
/
CDIO_CD_FRAMESIZE
;
t
->
psz_name
=
strdup
(
psz_track
);
t
->
psz_name
=
strdup
(
psz_track
);
dbg_print
(
INPUT_DBG_MRL
,
"track[%d] i_size: %lld"
,
i
,
t
->
i_size
);
dbg_print
(
INPUT_DBG_MRL
,
"track[%d] i_size: %lld"
,
i
,
t
->
i_size
);
...
@@ -532,8 +527,7 @@ VCDLIDs( access_t * p_access )
...
@@ -532,8 +527,7 @@ VCDLIDs( access_t * p_access )
char
psz_lid
[
100
];
char
psz_lid
[
100
];
seekpoint_t
*
s
=
vlc_seekpoint_New
();
seekpoint_t
*
s
=
vlc_seekpoint_New
();
snprintf
(
psz_lid
,
sizeof
(
psz_lid
),
"%s %02d"
,
_
(
"LID"
),
snprintf
(
psz_lid
,
sizeof
(
psz_lid
),
"%s %02d"
,
_
(
"LID"
),
i_lid
);
i_lid
);
s
->
i_byte_offset
=
0
;
/* A lid doesn't have an offset
s
->
i_byte_offset
=
0
;
/* A lid doesn't have an offset
size associated with it */
size associated with it */
...
@@ -696,7 +690,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
...
@@ -696,7 +690,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
{
{
p_access
->
info
.
i_size
=
p_vcdplayer
->
p_title
[
i_track
-
1
]
->
i_size
;
p_access
->
info
.
i_size
=
p_vcdplayer
->
p_title
[
i_track
-
1
]
->
i_size
;
p_access
->
info
.
i_pos
=
(
int64_t
)
M2F2_SECTOR_SIZE
*
p_access
->
info
.
i_pos
=
(
int64_t
)
M2F2_SECTOR_SIZE
*
(
vcdinfo_get_track_lsn
(
p_vcdplayer
->
vcd
,
i_track
)
-
i_lsn
)
;
(
vcdinfo_get_track_lsn
(
p_vcdplayer
->
vcd
,
i_track
)
-
i_lsn
)
;
}
else
{
}
else
{
p_access
->
info
.
i_size
=
M2F2_SECTOR_SIZE
*
(
int64_t
)
p_access
->
info
.
i_size
=
M2F2_SECTOR_SIZE
*
(
int64_t
)
vcdinfo_get_entry_sect_count
(
p_vcdplayer
->
vcd
,
p_itemid
->
num
);
vcdinfo_get_entry_sect_count
(
p_vcdplayer
->
vcd
,
p_itemid
->
num
);
...
@@ -735,7 +729,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
...
@@ -735,7 +729,7 @@ VCDSetOrigin( access_t *p_access, lsn_t i_lsn, track_t i_track,
}
}
p_access
->
info
.
i_update
=
INPUT_UPDATE_TITLE
|
INPUT_UPDATE_SIZE
p_access
->
info
.
i_update
=
INPUT_UPDATE_TITLE
|
INPUT_UPDATE_SIZE
|
INPUT_UPDATE_SEEKPOINT
;
|
INPUT_UPDATE_SEEKPOINT
;
VCDUpdateTitle
(
p_access
);
VCDUpdateTitle
(
p_access
);
...
...
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