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
258396bb
Commit
258396bb
authored
Feb 07, 2010
by
Toralf Niebuhr
Committed by
Felix Paul Kühne
Feb 08, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed unused exceptions
Signed-off-by:
Felix Paul Kühne
<
fkuehne@videolan.org
>
parent
80b41650
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
31 deletions
+2
-31
projects/macosx/framework/Sources/VLCLibrary.m
projects/macosx/framework/Sources/VLCLibrary.m
+0
-17
projects/macosx/framework/Sources/VLCMediaLibrary.m
projects/macosx/framework/Sources/VLCMediaLibrary.m
+2
-5
projects/macosx/framework/Sources/VLCMediaListPlayer.m
projects/macosx/framework/Sources/VLCMediaListPlayer.m
+0
-6
projects/macosx/framework/Sources/VLCMediaPlayer.m
projects/macosx/framework/Sources/VLCMediaPlayer.m
+0
-3
No files found.
projects/macosx/framework/Sources/VLCLibrary.m
View file @
258396bb
...
@@ -34,21 +34,6 @@
...
@@ -34,21 +34,6 @@
static
VLCLibrary
*
sharedLibrary
=
nil
;
static
VLCLibrary
*
sharedLibrary
=
nil
;
void
__catch_exception
(
void
*
e
,
const
char
*
function
,
const
char
*
file
,
int
line_number
)
{
libvlc_exception_t
*
ex
=
(
libvlc_exception_t
*
)
e
;
if
(
libvlc_exception_raised
(
ex
)
)
{
NSException
*
libvlcException
=
[
NSException
exceptionWithName:
@"LibVLCException"
reason:
[
NSString
stringWithFormat
:
@"libvlc has thrown us an error: %s (%s:%d %s)"
,
libvlc_errmsg
(),
file
,
line_number
,
function
]
userInfo:
nil
];
libvlc_exception_clear
(
ex
);
@throw
libvlcException
;
}
}
@implementation
VLCLibrary
@implementation
VLCLibrary
+
(
VLCLibrary
*
)
sharedLibrary
+
(
VLCLibrary
*
)
sharedLibrary
{
{
...
@@ -64,8 +49,6 @@ void __catch_exception( void * e, const char * function, const char * file, int
...
@@ -64,8 +49,6 @@ void __catch_exception( void * e, const char * function, const char * file, int
{
{
if
(
self
=
[
super
init
])
if
(
self
=
[
super
init
])
{
{
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
NSArray
*
vlcParams
=
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"VLCParams"
];
NSArray
*
vlcParams
=
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"VLCParams"
];
if
(
!
vlcParams
)
{
if
(
!
vlcParams
)
{
...
...
projects/macosx/framework/Sources/VLCMediaLibrary.m
View file @
258396bb
...
@@ -46,10 +46,7 @@
...
@@ -46,10 +46,7 @@
{
{
mlib
=
libvlc_media_library_new
(
[
VLCLibrary
sharedInstance
]);
mlib
=
libvlc_media_library_new
(
[
VLCLibrary
sharedInstance
]);
libvlc_exception_t
p_e
;
libvlc_media_library_load
(
mlib
);
libvlc_exception_init
(
&
p_e
);
libvlc_media_library_load
(
mlib
,
&
p_e
);
catch_exception
(
&
p_e
);
allMedia
=
nil
;
allMedia
=
nil
;
}
}
...
@@ -70,7 +67,7 @@
...
@@ -70,7 +67,7 @@
{
{
if
(
!
allMedia
)
if
(
!
allMedia
)
{
{
libvlc_media_list_t
*
p_mlist
=
libvlc_media_library_media_list
(
mlib
,
NULL
);
libvlc_media_list_t
*
p_mlist
=
libvlc_media_library_media_list
(
mlib
);
allMedia
=
[[
VLCMediaList
mediaListWithLibVLCMediaList
:
p_mlist
]
retain
];
allMedia
=
[[
VLCMediaList
mediaListWithLibVLCMediaList
:
p_mlist
]
retain
];
libvlc_media_list_release
(
p_mlist
);
libvlc_media_list_release
(
p_mlist
);
}
}
...
...
projects/macosx/framework/Sources/VLCMediaListPlayer.m
View file @
258396bb
...
@@ -102,18 +102,12 @@
...
@@ -102,18 +102,12 @@
-
(
void
)
playMedia
:(
VLCMedia
*
)
media
-
(
void
)
playMedia
:(
VLCMedia
*
)
media
{
{
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
libvlc_media_list_player_play_item
(
instance
,
[
media
libVLCMediaDescriptor
]);
libvlc_media_list_player_play_item
(
instance
,
[
media
libVLCMediaDescriptor
]);
catch_exception
(
&
ex
);
}
}
-
(
void
)
play
-
(
void
)
play
{
{
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
libvlc_media_list_player_play
(
instance
);
libvlc_media_list_player_play
(
instance
);
catch_exception
(
&
ex
);
}
}
-
(
void
)
stop
-
(
void
)
stop
...
...
projects/macosx/framework/Sources/VLCMediaPlayer.m
View file @
258396bb
...
@@ -724,10 +724,7 @@ static const VLCMediaPlayerState libvlc_to_local_state[] =
...
@@ -724,10 +724,7 @@ static const VLCMediaPlayerState libvlc_to_local_state[] =
// Create a media instance, it doesn't matter what library we start off with
// Create a media instance, it doesn't matter what library we start off with
// it will change depending on the media descriptor provided to the media
// it will change depending on the media descriptor provided to the media
// instance
// instance
libvlc_exception_t
ex
;
libvlc_exception_init
(
&
ex
);
instance
=
libvlc_media_player_new
([
VLCLibrary
sharedInstance
]);
instance
=
libvlc_media_player_new
([
VLCLibrary
sharedInstance
]);
catch_exception
(
&
ex
);
[
self
registerObservers
];
[
self
registerObservers
];
...
...
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