Changeset 9df6f20907913b9f2d2bfc9c0578597083d24456
- Timestamp:
- 10/22/07 22:06:22
(10 months ago)
- Author:
- Rafaël Carré <funman@videolan.org>
- git-committer:
- Rafaël Carré <funman@videolan.org> 1193083582 +0000
- git-parent:
[e6a14c1dcb64eba9bd1739e34c1b1965e776a946]
- git-author:
- Rafaël Carré <funman@videolan.org> 1193083582 +0000
- Message:
libvlc_destroy() -> libvlc_release()
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r6ee1e19 |
r9df6f20 |
|
| 662 | 662 | vlcDataObject->onClose(); |
|---|
| 663 | 663 | |
|---|
| 664 | | libvlc_destroy(p_libvlc, NULL ); |
|---|
| | 664 | libvlc_release(p_libvlc, NULL ); |
|---|
| 665 | 665 | } |
|---|
| 666 | 666 | return S_OK; |
|---|
| r8837d3d |
r9df6f20 |
|
| 56 | 56 | InstanceHandle Create (int argc, U8String[] argv, NativeException ex); |
|---|
| 57 | 57 | |
|---|
| 58 | | [DllImport ("libvlc-control.dll", EntryPoint="libvlc_destroy")] |
|---|
| | 58 | [DllImport ("libvlc-control.dll", EntryPoint="libvlc_release")] |
|---|
| 59 | 59 | static extern void Destroy (IntPtr ptr, NativeException ex); |
|---|
| 60 | 60 | |
|---|
| rcdab2db |
r9df6f20 |
|
| 82 | 82 | instance = getClassInstance( env, _this ); |
|---|
| 83 | 83 | |
|---|
| 84 | | libvlc_destroy( (libvlc_instance_t *) instance, NULL); |
|---|
| | 84 | libvlc_release( (libvlc_instance_t *) instance, NULL); |
|---|
| 85 | 85 | |
|---|
| 86 | 86 | return; |
|---|
| r6ee1e19 |
r9df6f20 |
|
| 113 | 113 | { |
|---|
| 114 | 114 | libvlc_exception_t ex; |
|---|
| 115 | | libvlc_destroy( LIBVLC_INSTANCE->p_instance, &ex ); |
|---|
| | 115 | libvlc_release( LIBVLC_INSTANCE->p_instance, &ex ); |
|---|
| 116 | 116 | PyObject_DEL( self ); |
|---|
| 117 | 117 | } |
|---|
| r2e7f3ec |
r9df6f20 |
|
| 109 | 109 | libvlc_exception_init( &ex ); |
|---|
| 110 | 110 | |
|---|
| 111 | | libvlc_destroy( instance, &ex ); |
|---|
| | 111 | libvlc_release( instance, &ex ); |
|---|
| 112 | 112 | } |
|---|
| 113 | 113 | instance = nil; |
|---|
| r6ee1e19 |
r9df6f20 |
|
| 43 | 43 | ASSERT_NOEXCEPTION; |
|---|
| 44 | 44 | id1 = libvlc_get_vlc_id( p_i1 ); |
|---|
| 45 | | libvlc_destroy( p_i1, &exception ); |
|---|
| | 45 | libvlc_release( p_i1, &exception ); |
|---|
| 46 | 46 | ASSERT_NOEXCEPTION; |
|---|
| 47 | 47 | |
|---|
| … | … | |
| 58 | 58 | |
|---|
| 59 | 59 | fprintf( stderr, "Destroy 1\n" ); |
|---|
| 60 | | libvlc_destroy( p_i1, &exception ); |
|---|
| | 60 | libvlc_release( p_i1, &exception ); |
|---|
| 61 | 61 | ASSERT_NOEXCEPTION; |
|---|
| 62 | 62 | fprintf( stderr, "Destroy 2\n" ); |
|---|
| 63 | | libvlc_destroy( p_i2, &exception ); |
|---|
| | 63 | libvlc_release( p_i2, &exception ); |
|---|
| 64 | 64 | ASSERT_NOEXCEPTION; |
|---|
| 65 | 65 | |
|---|