Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
03866185
Commit
03866185
authored
Jul 06, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
messages: Prefer the object name over the object type if type is VLC_GENERIC.
parent
3d59250a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
include/vlc_messages.h
include/vlc_messages.h
+1
-1
modules/gui/beos/MessagesWindow.cpp
modules/gui/beos/MessagesWindow.cpp
+1
-1
src/control/log.c
src/control/log.c
+1
-1
src/misc/messages.c
src/misc/messages.c
+13
-3
No files found.
include/vlc_messages.h
View file @
03866185
...
@@ -44,7 +44,7 @@ typedef struct
...
@@ -44,7 +44,7 @@ typedef struct
{
{
int
i_type
;
/**< message type, see below */
int
i_type
;
/**< message type, see below */
int
i_object_id
;
int
i_object_id
;
c
onst
char
*
psz_object_type
;
c
har
*
psz_object
;
char
*
psz_module
;
char
*
psz_module
;
char
*
psz_msg
;
/**< the message itself */
char
*
psz_msg
;
/**< the message itself */
char
*
psz_header
;
/**< Additional header */
char
*
psz_header
;
/**< Additional header */
...
...
modules/gui/beos/MessagesWindow.cpp
View file @
03866185
...
@@ -80,7 +80,7 @@ void MessagesView::Pulse()
...
@@ -80,7 +80,7 @@ void MessagesView::Pulse()
case
VLC_MSG_DBG
:
color
=
gray
;
break
;
case
VLC_MSG_DBG
:
color
=
gray
;
break
;
}
}
psz_module_type
=
p_sub
->
p_msg
[
i_start
].
psz_object
_type
;
psz_module_type
=
p_sub
->
p_msg
[
i_start
].
psz_object
;
if
(
LockLooper
()
)
if
(
LockLooper
()
)
{
{
...
...
src/control/log.c
View file @
03866185
...
@@ -178,7 +178,7 @@ libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
...
@@ -178,7 +178,7 @@ libvlc_log_message_t *libvlc_log_iterator_next( libvlc_log_iterator_t *p_iter,
vlc_mutex_lock
(
p_iter
->
p_messages
->
p_lock
);
vlc_mutex_lock
(
p_iter
->
p_messages
->
p_lock
);
msg
=
p_iter
->
p_messages
->
p_msg
+
i_pos
;
msg
=
p_iter
->
p_messages
->
p_msg
+
i_pos
;
buffer
->
i_severity
=
msg
->
i_type
;
buffer
->
i_severity
=
msg
->
i_type
;
buffer
->
psz_type
=
msg
->
psz_object
_type
;
buffer
->
psz_type
=
msg
->
psz_object
;
buffer
->
psz_name
=
msg
->
psz_module
;
buffer
->
psz_name
=
msg
->
psz_module
;
buffer
->
psz_header
=
msg
->
psz_header
;
buffer
->
psz_header
=
msg
->
psz_header
;
buffer
->
psz_message
=
msg
->
psz_msg
;
buffer
->
psz_message
=
msg
->
psz_msg
;
...
...
src/misc/messages.c
View file @
03866185
...
@@ -78,6 +78,14 @@ static void QueueMsg ( vlc_object_t *, int, const char *,
...
@@ -78,6 +78,14 @@ static void QueueMsg ( vlc_object_t *, int, const char *,
static
void
FlushMsg
(
msg_queue_t
*
);
static
void
FlushMsg
(
msg_queue_t
*
);
static
void
PrintMsg
(
vlc_object_t
*
,
msg_item_t
*
);
static
void
PrintMsg
(
vlc_object_t
*
,
msg_item_t
*
);
static
inline
char
*
object_description
(
vlc_object_t
*
p_this
)
{
if
(
p_this
->
i_object_type
==
VLC_OBJECT_GENERIC
&&
p_this
->
psz_object_name
)
return
strdup
(
p_this
->
psz_object_name
);
return
strdup
(
p_this
->
psz_object_type
);
}
/**
/**
* Initialize messages queues
* Initialize messages queues
* This function initializes all message queues
* This function initializes all message queues
...
@@ -422,7 +430,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
...
@@ -422,7 +430,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
p_item
->
i_type
=
VLC_MSG_WARN
;
p_item
->
i_type
=
VLC_MSG_WARN
;
p_item
->
i_object_id
=
p_this
->
i_object_id
;
p_item
->
i_object_id
=
p_this
->
i_object_id
;
p_item
->
psz_object
_type
=
p_this
->
psz_object_type
;
p_item
->
psz_object
=
object_description
(
p_this
)
;
p_item
->
psz_module
=
strdup
(
"message"
);
p_item
->
psz_module
=
strdup
(
"message"
);
p_item
->
psz_msg
=
strdup
(
"message queue overflowed"
);
p_item
->
psz_msg
=
strdup
(
"message queue overflowed"
);
p_item
->
psz_header
=
NULL
;
p_item
->
psz_header
=
NULL
;
...
@@ -443,7 +451,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
...
@@ -443,7 +451,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
/* Fill message information fields */
/* Fill message information fields */
p_item
->
i_type
=
i_type
;
p_item
->
i_type
=
i_type
;
p_item
->
i_object_id
=
p_this
->
i_object_id
;
p_item
->
i_object_id
=
p_this
->
i_object_id
;
p_item
->
psz_object
_type
=
p_this
->
psz_object_type
;
p_item
->
psz_object
=
object_description
(
p_this
)
;
p_item
->
psz_module
=
strdup
(
psz_module
);
p_item
->
psz_module
=
strdup
(
psz_module
);
p_item
->
psz_msg
=
psz_str
;
p_item
->
psz_msg
=
psz_str
;
p_item
->
psz_header
=
psz_header
;
p_item
->
psz_header
=
psz_header
;
...
@@ -455,6 +463,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
...
@@ -455,6 +463,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
free
(
p_item
->
psz_module
);
free
(
p_item
->
psz_module
);
free
(
p_item
->
psz_msg
);
free
(
p_item
->
psz_msg
);
free
(
p_item
->
psz_header
);
free
(
p_item
->
psz_header
);
free
(
p_item
->
psz_object
);
}
}
vlc_mutex_unlock
(
&
p_queue
->
lock
);
vlc_mutex_unlock
(
&
p_queue
->
lock
);
...
@@ -500,6 +509,7 @@ static void FlushMsg ( msg_queue_t *p_queue )
...
@@ -500,6 +509,7 @@ static void FlushMsg ( msg_queue_t *p_queue )
free
(
p_queue
->
msg
[
i_index
].
psz_msg
);
free
(
p_queue
->
msg
[
i_index
].
psz_msg
);
free
(
p_queue
->
msg
[
i_index
].
psz_module
);
free
(
p_queue
->
msg
[
i_index
].
psz_module
);
free
(
p_queue
->
msg
[
i_index
].
psz_header
);
free
(
p_queue
->
msg
[
i_index
].
psz_header
);
free
(
p_queue
->
msg
[
i_index
].
psz_object
);
}
}
/* Update the new start value */
/* Update the new start value */
...
@@ -545,7 +555,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
...
@@ -545,7 +555,7 @@ static void PrintMsg ( vlc_object_t * p_this, msg_item_t * p_item )
break
;
break
;
}
}
psz_object
=
p_item
->
psz_object
_type
;
psz_object
=
p_item
->
psz_object
;
#ifdef UNDER_CE
#ifdef UNDER_CE
# define CE_WRITE(str) WriteFile( QUEUE.logfile, \
# define CE_WRITE(str) WriteFile( QUEUE.logfile, \
...
...
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