Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
77ae11cf
Commit
77ae11cf
authored
May 22, 2011
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: remove references to VLCIntf from the EyeTV class to work-around libvlc crashes
refs #4734
parent
929f2db2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
modules/gui/macosx/eyetv.m
modules/gui/macosx/eyetv.m
+10
-11
No files found.
modules/gui/macosx/eyetv.m
View file @
77ae11cf
/*****************************************************************************
/*****************************************************************************
* eyetv.m: small class to control the notification parts of the EyeTV plugin
* eyetv.m: small class to control the notification parts of the EyeTV plugin
*****************************************************************************
*****************************************************************************
* Copyright (C) 2006-20
07
the VideoLAN team
* Copyright (C) 2006-20
11
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Felix Kühne <fkuehne at videolan dot org>
* Authors: Felix Kühne <fkuehne at videolan dot org>
...
@@ -57,8 +57,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -57,8 +57,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
-
(
void
)
globalNotificationReceived
:
(
NSNotification
*
)
theNotification
-
(
void
)
globalNotificationReceived
:
(
NSNotification
*
)
theNotification
{
{
msg_Dbg
(
VLCIntf
,
"notification received in VLC with name %s and object %s"
,
NSLog
(
@"notification received in VLC with name %@ and object %@"
,
[
theNotification
name
],
[
theNotification
object
]
);
[[
theNotification
name
]
UTF8String
],
[[
theNotification
object
]
UTF8String
]
);
/* update our info on the used device */
/* update our info on the used device */
if
(
[[
theNotification
name
]
isEqualToString
:
@"DeviceAdded"
]
)
if
(
[[
theNotification
name
]
isEqualToString
:
@"DeviceAdded"
]
)
...
@@ -95,7 +94,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -95,7 +94,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
if
(
nil
==
descriptor
)
if
(
nil
==
descriptor
)
{
{
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
msg_Err
(
VLCIntf
,
"opening EyeTV failed with error status '%s'"
,
[
errorString
UTF8String
]
);
NSLog
(
@"opening EyeTV failed with error status '%@'"
,
errorString
);
}
}
[
script
release
];
[
script
release
];
}
}
...
@@ -110,7 +109,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -110,7 +109,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
if
(
nil
==
descriptor
)
if
(
nil
==
descriptor
)
{
{
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
msg_Err
(
VLCIntf
,
"EyeTV channel inventory failed with error status '%s'"
,
[
errorString
UTF8String
]
);
NSLog
(
@"EyeTV channel inventory failed with error status '%@'"
,
errorString
);
}
}
else
else
{
{
...
@@ -134,7 +133,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -134,7 +133,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
"channel_up
\n
"
"channel_up
\n
"
"get current channel
\n
"
"get current channel
\n
"
"end tell"
];
"end tell"
];
msg_Dbg
(
VLCIntf
,
"telling eyetv to switch 1 channel up"
);
NSLog
(
@
"telling eyetv to switch 1 channel up"
);
}
}
else
else
{
{
...
@@ -143,14 +142,14 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -143,14 +142,14 @@ static VLCEyeTVController *_o_sharedInstance = nil;
"channel_down
\n
"
"channel_down
\n
"
"get current channel
\n
"
"get current channel
\n
"
"end tell"
];
"end tell"
];
msg_Dbg
(
VLCIntf
,
"telling eyetv to switch 1 channel down"
);
NSLog
(
@
"telling eyetv to switch 1 channel down"
);
}
}
descriptor
=
[
script
executeAndReturnError
:
&
errorDict
];
descriptor
=
[
script
executeAndReturnError
:
&
errorDict
];
if
(
nil
==
descriptor
)
if
(
nil
==
descriptor
)
{
{
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
msg_Err
(
VLCIntf
,
"EyeTV channel change failed with error status '%s'"
,
[
errorString
UTF8String
]
);
NSLog
(
@"EyeTV channel change failed with error status '%@'"
,
errorString
);
}
}
else
else
{
{
...
@@ -203,7 +202,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -203,7 +202,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
if
(
nil
==
descriptor
)
if
(
nil
==
descriptor
)
{
{
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
msg_Err
(
VLCIntf
,
"EyeTV source change failed with error status '%s'"
,
[
errorString
UTF8String
]
);
NSLog
(
@"EyeTV source change failed with error status '%@'"
,
errorString
);
}
}
[
script
release
];
[
script
release
];
}
}
...
@@ -218,7 +217,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
...
@@ -218,7 +217,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
if
(
nil
==
descriptor
)
if
(
nil
==
descriptor
)
{
{
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
NSString
*
errorString
=
[
errorDict
objectForKey
:
NSAppleScriptErrorMessage
];
msg_Err
(
VLCIntf
,
"EyeTV channel inventory failed with error status '%s'"
,
[
errorString
UTF8String
]
);
NSLog
(
@"EyeTV channel inventory failed with error status '%@'"
,
errorString
);
}
}
else
else
{
{
...
...
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