Changeset 06a986a5f375bc21a107349bd05548ea2853af3f
- Timestamp:
- 31/05/08 12:14:18
(6 months ago)
- Author:
- Rémi Denis-Courmont <rdenis@simphalempin.com>
- git-committer:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1212228858 +0300
- git-parent:
[1814dd90cd47216f0d51d5cb84de3a4466080de5]
- git-author:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1212228858 +0300
- Message:
libvlc_InternalAddInft: Remove unused b_block parameter
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r1814dd9 |
r06a986a |
|
| 170 | 170 | libvlc_exception_t *p_e ) |
|---|
| 171 | 171 | { |
|---|
| 172 | | if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, false, true, 0, NULL ) ) |
|---|
| | 172 | if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, true, 0, NULL ) ) |
|---|
| 173 | 173 | RAISEVOID( "Interface initialization failed" ); |
|---|
| 174 | 174 | } |
|---|
| rc6c6c0e |
r06a986a |
|
| 48 | 48 | VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, bool ) ); |
|---|
| 49 | 49 | |
|---|
| 50 | | VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, bool, |
|---|
| | 50 | VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, |
|---|
| 51 | 51 | bool, int, const char *const * ) ); |
|---|
| 52 | 52 | |
|---|
| r522baa5 |
r06a986a |
|
| 807 | 807 | { |
|---|
| 808 | 808 | sprintf( psz_temp, "%s,none", psz_module ); |
|---|
| 809 | | libvlc_InternalAddIntf( p_libvlc, psz_temp, false, false, 0, NULL ); |
|---|
| | 809 | libvlc_InternalAddIntf( p_libvlc, psz_temp, false, 0, NULL ); |
|---|
| 810 | 810 | free( psz_temp ); |
|---|
| 811 | 811 | } |
|---|
| … | … | |
| 817 | 817 | * Always load the hotkeys interface if it exists |
|---|
| 818 | 818 | */ |
|---|
| 819 | | libvlc_InternalAddIntf( p_libvlc, "hotkeys,none", false, false, 0, NULL ); |
|---|
| | 819 | libvlc_InternalAddIntf( p_libvlc, "hotkeys,none", false, 0, NULL ); |
|---|
| 820 | 820 | |
|---|
| 821 | 821 | #ifdef HAVE_DBUS_3 |
|---|
| … | … | |
| 823 | 823 | * we do it only when playlist exists, because dbus module needs it */ |
|---|
| 824 | 824 | if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) |
|---|
| 825 | | libvlc_InternalAddIntf( p_libvlc, "dbus,none", false, false, 0, NULL ); |
|---|
| | 825 | libvlc_InternalAddIntf( p_libvlc, "dbus,none", false, 0, NULL ); |
|---|
| 826 | 826 | |
|---|
| 827 | 827 | /* Prevents the power management daemon from suspending the system |
|---|
| 828 | 828 | * when VLC is active */ |
|---|
| 829 | 829 | if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) |
|---|
| 830 | | libvlc_InternalAddIntf( p_libvlc, "inhibit,none", false, false, 0, NULL ); |
|---|
| | 830 | libvlc_InternalAddIntf( p_libvlc, "inhibit,none", false, 0, NULL ); |
|---|
| 831 | 831 | #endif |
|---|
| 832 | 832 | |
|---|
| … | … | |
| 838 | 838 | if( config_GetInt( p_libvlc, "disable-screensaver" ) ) |
|---|
| 839 | 839 | { |
|---|
| 840 | | libvlc_InternalAddIntf( p_libvlc, "screensaver,none", false, false, 0, NULL ); |
|---|
| | 840 | libvlc_InternalAddIntf( p_libvlc, "screensaver,none", false, 0, NULL ); |
|---|
| 841 | 841 | } |
|---|
| 842 | 842 | #endif |
|---|
| … | … | |
| 844 | 844 | if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) |
|---|
| 845 | 845 | { |
|---|
| 846 | | libvlc_InternalAddIntf( p_libvlc, "logger,none", false, false, 0, NULL ); |
|---|
| | 846 | libvlc_InternalAddIntf( p_libvlc, "logger,none", false, 0, NULL ); |
|---|
| 847 | 847 | } |
|---|
| 848 | 848 | #ifdef HAVE_SYSLOG_H |
|---|
| … | … | |
| 850 | 850 | { |
|---|
| 851 | 851 | const char *psz_logmode = "logmode=syslog"; |
|---|
| 852 | | libvlc_InternalAddIntf( p_libvlc, "logger,none", false, false, |
|---|
| | 852 | libvlc_InternalAddIntf( p_libvlc, "logger,none", false, |
|---|
| 853 | 853 | 1, &psz_logmode ); |
|---|
| 854 | 854 | } |
|---|
| … | … | |
| 857 | 857 | if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) |
|---|
| 858 | 858 | { |
|---|
| 859 | | libvlc_InternalAddIntf( p_libvlc, "showintf,none", false, false, 0, NULL ); |
|---|
| | 859 | libvlc_InternalAddIntf( p_libvlc, "showintf,none", false, 0, NULL ); |
|---|
| 860 | 860 | } |
|---|
| 861 | 861 | |
|---|
| 862 | 862 | if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) |
|---|
| 863 | 863 | { |
|---|
| 864 | | libvlc_InternalAddIntf( p_libvlc, "netsync,none", false, false, 0, NULL ); |
|---|
| | 864 | libvlc_InternalAddIntf( p_libvlc, "netsync,none", false, 0, NULL ); |
|---|
| 865 | 865 | } |
|---|
| 866 | 866 | |
|---|
| … | … | |
| 1099 | 1099 | int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, |
|---|
| 1100 | 1100 | char const *psz_module, |
|---|
| 1101 | | bool b_block, bool b_play, |
|---|
| | 1101 | bool b_play, |
|---|
| 1102 | 1102 | int i_options, const char *const *ppsz_options ) |
|---|
| 1103 | 1103 | { |
|---|
| … | … | |
| 1147 | 1147 | vlc_object_release( p_intf ); |
|---|
| 1148 | 1148 | return i_err; |
|---|
| 1149 | | } |
|---|
| 1150 | | |
|---|
| 1151 | | if( b_block ) |
|---|
| 1152 | | { |
|---|
| 1153 | | vlc_thread_join( p_intf ); |
|---|
| 1154 | | vlc_object_detach( p_intf ); |
|---|
| 1155 | | vlc_object_release( p_intf ); |
|---|
| 1156 | 1149 | } |
|---|
| 1157 | 1150 | |
|---|