Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
59f746f6
Commit
59f746f6
authored
Jan 15, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Atmo: port Win32 code to UNICODE friendly APIs
This needs testing
parent
deb6cf93
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
9 deletions
+10
-9
modules/video_filter/atmo/AtmoClassicConnection.cpp
modules/video_filter/atmo/AtmoClassicConnection.cpp
+1
-1
modules/video_filter/atmo/AtmoDmxSerialConnection.cpp
modules/video_filter/atmo/AtmoDmxSerialConnection.cpp
+1
-1
modules/video_filter/atmo/AtmoMultiConnection.cpp
modules/video_filter/atmo/AtmoMultiConnection.cpp
+1
-1
modules/video_filter/atmo/FnordlichtConnection.cpp
modules/video_filter/atmo/FnordlichtConnection.cpp
+1
-1
modules/video_filter/atmo/MoMoConnection.cpp
modules/video_filter/atmo/MoMoConnection.cpp
+1
-1
modules/video_filter/atmo/atmo.cpp
modules/video_filter/atmo/atmo.cpp
+5
-4
No files found.
modules/video_filter/atmo/AtmoClassicConnection.cpp
View file @
59f746f6
...
@@ -54,7 +54,7 @@ ATMO_BOOL CAtmoClassicConnection::OpenConnection() {
...
@@ -54,7 +54,7 @@ ATMO_BOOL CAtmoClassicConnection::OpenConnection() {
#if defined(WIN32)
#if defined(WIN32)
m_hComport
=
CreateFile
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
m_hComport
=
CreateFile
A
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
{
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
{
// we have a problem here can't open com port... somebody else may use it?
// we have a problem here can't open com port... somebody else may use it?
// m_dwLastWin32Error = GetLastError();
// m_dwLastWin32Error = GetLastError();
...
...
modules/video_filter/atmo/AtmoDmxSerialConnection.cpp
View file @
59f746f6
...
@@ -69,7 +69,7 @@ ATMO_BOOL CAtmoDmxSerialConnection::OpenConnection() {
...
@@ -69,7 +69,7 @@ ATMO_BOOL CAtmoDmxSerialConnection::OpenConnection() {
#if defined(WIN32)
#if defined(WIN32)
m_hComport
=
CreateFile
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
m_hComport
=
CreateFile
A
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
{
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
{
// we have a problem here can't open com port... somebody else may use it?
// we have a problem here can't open com port... somebody else may use it?
// m_dwLastWin32Error = GetLastError();
// m_dwLastWin32Error = GetLastError();
...
...
modules/video_filter/atmo/AtmoMultiConnection.cpp
View file @
59f746f6
...
@@ -50,7 +50,7 @@ HANDLE CAtmoMultiConnection::OpenDevice(char *devName)
...
@@ -50,7 +50,7 @@ HANDLE CAtmoMultiConnection::OpenDevice(char *devName)
#endif
#endif
#if defined(WIN32)
#if defined(WIN32)
hComport
=
CreateFile
(
devName
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
hComport
=
CreateFile
A
(
devName
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
if
(
hComport
==
INVALID_HANDLE_VALUE
)
{
if
(
hComport
==
INVALID_HANDLE_VALUE
)
{
#if !defined(_ATMO_VLC_PLUGIN_)
#if !defined(_ATMO_VLC_PLUGIN_)
m_dwLastWin32Error
=
GetLastError
();
m_dwLastWin32Error
=
GetLastError
();
...
...
modules/video_filter/atmo/FnordlichtConnection.cpp
View file @
59f746f6
...
@@ -73,7 +73,7 @@ ATMO_BOOL CFnordlichtConnection::OpenConnection()
...
@@ -73,7 +73,7 @@ ATMO_BOOL CFnordlichtConnection::OpenConnection()
#if defined(WIN32)
#if defined(WIN32)
m_hComport
=
CreateFile
(
serdevice
,
m_hComport
=
CreateFile
A
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
OPEN_EXISTING
,
0
,
NULL
);
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
...
...
modules/video_filter/atmo/MoMoConnection.cpp
View file @
59f746f6
...
@@ -54,7 +54,7 @@ ATMO_BOOL CMoMoConnection::OpenConnection() {
...
@@ -54,7 +54,7 @@ ATMO_BOOL CMoMoConnection::OpenConnection() {
#if defined(WIN32)
#if defined(WIN32)
m_hComport
=
CreateFile
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
m_hComport
=
CreateFile
A
(
serdevice
,
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
NULL
);
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
{
if
(
m_hComport
==
INVALID_HANDLE_VALUE
)
{
// we have a problem here can't open com port... somebody else may use it?
// we have a problem here can't open com port... somebody else may use it?
// m_dwLastWin32Error = GetLastError();
// m_dwLastWin32Error = GetLastError();
...
...
modules/video_filter/atmo/atmo.cpp
View file @
59f746f6
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
#include <vlc_playlist.h>
#include <vlc_playlist.h>
#include <vlc_filter.h>
#include <vlc_filter.h>
#include <vlc_atomic.h>
#include <vlc_atomic.h>
#include <vlc_charset.h>
#include "filter_picture.h"
#include "filter_picture.h"
...
@@ -1847,8 +1848,8 @@ static void Atmo_SetupParameters(filter_t *p_filter)
...
@@ -1847,8 +1848,8 @@ static void Atmo_SetupParameters(filter_t *p_filter)
COM Server for AtmoLight not running ?
COM Server for AtmoLight not running ?
if the exe path is configured try to start the "userspace" driver
if the exe path is configured try to start the "userspace" driver
*/
*/
char
*
psz_path
=
var_CreateGetStringCommand
(
p_filter
,
LPTSTR
psz_path
=
ToT
(
var_CreateGetStringCommand
(
p_filter
,
CFG_PREFIX
"atmowinexe"
);
CFG_PREFIX
"atmowinexe"
)
)
;
if
(
psz_path
!=
NULL
)
if
(
psz_path
!=
NULL
)
{
{
STARTUPINFO
startupinfo
;
STARTUPINFO
startupinfo
;
...
@@ -1858,7 +1859,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
...
@@ -1858,7 +1859,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
if
(
CreateProcess
(
psz_path
,
NULL
,
NULL
,
NULL
,
if
(
CreateProcess
(
psz_path
,
NULL
,
NULL
,
NULL
,
FALSE
,
0
,
NULL
,
NULL
,
&
startupinfo
,
&
pinfo
)
==
TRUE
)
FALSE
,
0
,
NULL
,
NULL
,
&
startupinfo
,
&
pinfo
)
==
TRUE
)
{
{
msg_Dbg
(
p_filter
,
"launched AtmoWin from %s"
,
psz_path
);
msg_Dbg
(
p_filter
,
"launched AtmoWin from %s"
,
FromT
(
psz_path
)
);
WaitForInputIdle
(
pinfo
.
hProcess
,
5000
);
WaitForInputIdle
(
pinfo
.
hProcess
,
5000
);
/*
/*
retry to initialize the library COM ... functionality
retry to initialize the library COM ... functionality
...
@@ -1866,7 +1867,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
...
@@ -1866,7 +1867,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
*/
*/
i
=
AtmoInitialize
(
p_filter
,
false
);
i
=
AtmoInitialize
(
p_filter
,
false
);
}
else
{
}
else
{
msg_Err
(
p_filter
,
"failed to launch AtmoWin from %s"
,
psz_path
);
msg_Err
(
p_filter
,
"failed to launch AtmoWin from %s"
,
FromT
(
psz_path
)
);
}
}
free
(
psz_path
);
free
(
psz_path
);
}
}
...
...
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