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
e1c0f35a
Commit
e1c0f35a
authored
Feb 22, 2004
by
Rocky Bernstein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mem leak. (Caught by valgrind.)
parent
d675fdfc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
3 deletions
+31
-3
modules/access/cdda/access.c
modules/access/cdda/access.c
+31
-3
No files found.
modules/access/cdda/access.c
View file @
e1c0f35a
/*****************************************************************************
/*****************************************************************************
* cddax.c : CD digital audio input module for vlc using libcdio
* cddax.c : CD digital audio input module for vlc using libcdio
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000,
2003
VideoLAN
* Copyright (C) 2000,
2003, 2004
VideoLAN
* $Id: access.c,v 1.2
5 2004/02/14 17:36:05 gbazin
Exp $
* $Id: access.c,v 1.2
6 2004/02/22 10:30:22 rocky
Exp $
*
*
* Authors: Rocky Bernstein <rocky@panix.com>
* Authors: Rocky Bernstein <rocky@panix.com>
* Laurent Aimar <fenrir@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
...
@@ -72,6 +72,11 @@ static int CDDAFixupPlayList( input_thread_t *p_input,
...
@@ -72,6 +72,11 @@ static int CDDAFixupPlayList( input_thread_t *p_input,
cdda_data_t
*
p_cdda
,
const
char
*
psz_source
,
cdda_data_t
*
p_cdda
,
const
char
*
psz_source
,
bool
play_single_track
);
bool
play_single_track
);
static
void
CDDAUpdateVar
(
input_thread_t
*
p_input
,
int
i_entry
,
int
i_action
,
const
char
*
p_varname
,
char
*
p_label
,
const
char
*
p_debug_label
);
/****************************************************************************
/****************************************************************************
* Private functions
* Private functions
****************************************************************************/
****************************************************************************/
...
@@ -260,9 +265,13 @@ static int CDDASetArea( input_thread_t * p_input, input_area_t * p_area )
...
@@ -260,9 +265,13 @@ static int CDDASetArea( input_thread_t * p_input, input_area_t * p_area )
{
{
cdda_data_t
*
p_cdda
=
(
cdda_data_t
*
)
p_input
->
p_access_data
;
cdda_data_t
*
p_cdda
=
(
cdda_data_t
*
)
p_input
->
p_access_data
;
vlc_value_t
val
;
vlc_value_t
val
;
vlc_value_t
text
;
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_EXT
),
""
);
dbg_print
(
(
INPUT_DBG_CALL
|
INPUT_DBG_EXT
),
""
);
text
.
psz_string
=
_
(
"Track"
);
var_Change
(
p_input
,
"title"
,
VLC_VAR_SETTEXT
,
&
text
,
NULL
);
/* we can't use the interface slider until initilization is complete */
/* we can't use the interface slider until initilization is complete */
p_input
->
stream
.
b_seekable
=
0
;
p_input
->
stream
.
b_seekable
=
0
;
...
@@ -318,6 +327,25 @@ static void CDDASeek( input_thread_t * p_input, off_t i_off )
...
@@ -318,6 +327,25 @@ static void CDDASeek( input_thread_t * p_input, off_t i_off )
}
}
/****************************************************************************
Update the "varname" variable to i_num without triggering a callback.
****************************************************************************/
static
void
CDDAUpdateVar
(
input_thread_t
*
p_input
,
int
i_num
,
int
i_action
,
const
char
*
p_varname
,
char
*
p_label
,
const
char
*
p_debug_label
)
{
vlc_value_t
val
;
val
.
i_int
=
i_num
;
if
(
p_label
)
{
vlc_value_t
text
;
text
.
psz_string
=
p_label
;
var_Change
(
p_input
,
p_varname
,
VLC_VAR_SETTEXT
,
&
text
,
NULL
);
}
var_Change
(
p_input
,
p_varname
,
i_action
,
&
val
,
NULL
);
}
#define meta_info_add_str(title, str) \
#define meta_info_add_str(title, str) \
if ( str ) { \
if ( str ) { \
dbg_print( INPUT_DBG_META, "field %s: %s\n", title, str); \
dbg_print( INPUT_DBG_META, "field %s: %s\n", title, str); \
...
@@ -820,7 +848,6 @@ CDDAFixupPlayList( input_thread_t *p_input, cdda_data_t *p_cdda,
...
@@ -820,7 +848,6 @@ CDDAFixupPlayList( input_thread_t *p_input, cdda_data_t *p_cdda,
CDDACreatePlayListItem
(
p_input
,
p_cdda
,
p_playlist
,
i
,
psz_mrl
,
CDDACreatePlayListItem
(
p_input
,
p_cdda
,
p_playlist
,
i
,
psz_mrl
,
psz_mrl_max
,
psz_source
,
PLAYLIST_APPEND
,
psz_mrl_max
,
psz_source
,
PLAYLIST_APPEND
,
PLAYLIST_END
);
PLAYLIST_END
);
}
}
playlist_Command
(
p_playlist
,
PLAYLIST_GOTO
,
0
);
playlist_Command
(
p_playlist
,
PLAYLIST_GOTO
,
0
);
...
@@ -1099,6 +1126,7 @@ E_(Close)( vlc_object_t *p_this )
...
@@ -1099,6 +1126,7 @@ E_(Close)( vlc_object_t *p_this )
cddb_disc_destroy
(
p_cdda
->
cddb
.
disc
);
cddb_disc_destroy
(
p_cdda
->
cddb
.
disc
);
#endif
#endif
free
(
p_cdda
->
p_sectors
);
free
(
p_cdda
);
free
(
p_cdda
);
p_cdda_input
=
NULL
;
p_cdda_input
=
NULL
;
}
}
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