Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
8a8f3ad9
Commit
8a8f3ad9
authored
Sep 14, 2006
by
damienf
Browse files
- activex: initialization issues
parent
928454fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
activex/plugin.cpp
View file @
8a8f3ad9
...
...
@@ -33,6 +33,7 @@
#include
"connectioncontainer.h"
#include
"objectsafety.h"
#include
"vlccontrol.h"
#include
"vlccontrol2.h"
#include
"viewobject.h"
#include
"dataobject.h"
...
...
@@ -265,6 +266,7 @@ VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
vlcConnectionPointContainer
=
new
VLCConnectionPointContainer
(
this
);
vlcObjectSafety
=
new
VLCObjectSafety
(
this
);
vlcControl
=
new
VLCControl
(
this
);
vlcControl2
=
new
VLCControl2
(
this
);
vlcViewObject
=
new
VLCViewObject
(
this
);
vlcDataObject
=
new
VLCDataObject
(
this
);
vlcOleObject
=
new
VLCOleObject
(
this
);
...
...
@@ -284,6 +286,7 @@ VLCPlugin::~VLCPlugin()
delete
vlcOleObject
;
delete
vlcDataObject
;
delete
vlcViewObject
;
delete
vlcControl2
;
delete
vlcControl
;
delete
vlcConnectionPointContainer
;
delete
vlcProvideClassInfo
;
...
...
@@ -586,9 +589,8 @@ HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
RegCloseKey
(
h_key
);
}
#if 1
//ppsz_argv[0] = "C:\\cygwin\\home\\Damien_Fouilleul\\dev\\videolan\\vlc-trunk\\vlc";
ppsz_argv
[
0
]
=
"C:
\\
cygwin
\\
home
\\
damienf
\\
vlc-trunk
\\
vlc"
;
#if 0
ppsz_argv[0] = "C:\\cygwin\\home\\Damien_Fouilleul\\dev\\videolan\\vlc-trunk\\vlc";
#endif
// make sure plugin isn't affected with VLC single instance mode
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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