Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-macos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-macos
Commits
a1b42789
Commit
a1b42789
authored
5 years ago
by
Kateryna Kostiuk
Browse files
Options
Downloads
Patches
Plain Diff
call: enable streaming from file
Change-Id: I8f75e454560d81816e4083d65e918f537a64ca01
parent
43de2e25
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/views/CallView.h
+1
-1
1 addition, 1 deletion
src/views/CallView.h
src/views/CallView.mm
+8
-14
8 additions, 14 deletions
src/views/CallView.mm
with
9 additions
and
15 deletions
src/views/CallView.h
+
1
−
1
View file @
a1b42789
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
-
(
void
)
mouseIsMoving
:(
BOOL
)
move
;
-
(
void
)
mouseIsMoving
:(
BOOL
)
move
;
-
(
void
)
screenShare
;
-
(
void
)
screenShare
;
-
(
void
)
switchToDevice
:(
int
)
deviceID
;
-
(
void
)
switchToDevice
:(
int
)
deviceID
;
-
(
void
)
switchToFile
:(
std
::
s
tring
)
uri
;
-
(
void
)
switchToFile
:(
QS
tring
)
uri
;
-
(
QVector
<
QString
>
)
getDeviceList
;
-
(
QVector
<
QString
>
)
getDeviceList
;
-
(
NSString
*
)
getDefaultDeviceName
;
-
(
NSString
*
)
getDefaultDeviceName
;
...
...
This diff is collapsed.
Click to expand it.
src/views/CallView.mm
+
8
−
14
View file @
a1b42789
...
@@ -149,8 +149,7 @@ NSString *currentDevice;
...
@@ -149,8 +149,7 @@ NSString *currentDevice;
//check to see if we can accept the data
//check to see if we can accept the data
return
conforms
;
return
conforms
;
}
}
#if 0
// TODO: add file as a source
-
(
BOOL
)
performDragOperation
:(
id
<
NSDraggingInfo
>
)
sender
-
(
BOOL
)
performDragOperation
:(
id
<
NSDraggingInfo
>
)
sender
{
{
/*------------------------------------------------------
/*------------------------------------------------------
...
@@ -158,17 +157,12 @@ NSString *currentDevice;
...
@@ -158,17 +157,12 @@ NSString *currentDevice;
--------------------------------------------------------*/
--------------------------------------------------------*/
if
(
[
sender
draggingSource
]
!=
self
)
{
if
(
[
sender
draggingSource
]
!=
self
)
{
NSURL
*
fileURL
=
[
NSURL
URLFromPasteboard
:
[
sender
draggingPasteboard
]];
NSURL
*
fileURL
=
[
NSURL
URLFromPasteboard
:
[
sender
draggingPasteboard
]];
Call* call = [self getCurrentCall];
auto
name
=
QString
::
fromNSString
([
@"file:///"
stringByAppendingString
:
fileURL
.
path
]);
if (call == nullptr) return;
[
self
.
callDelegate
switchToFile
:
name
];
if (auto outVideo = call->firstMedia<media::Video>(media::Media::Direction::OUT)) {
outVideo->sourceModel()->setFile(QUrl::fromLocalFile(QString::fromUtf8([fileURL.path UTF8String])));
return
YES
;
return
YES
;
}
}
}
return
NO
;
return
NO
;
}
}
#endif
-
(
void
)
showContextualMenu
:(
NSEvent
*
)
theEvent
{
-
(
void
)
showContextualMenu
:(
NSEvent
*
)
theEvent
{
...
@@ -186,14 +180,13 @@ NSString *currentDevice;
...
@@ -186,14 +180,13 @@ NSString *currentDevice;
action:
@selector
(
captureScreen
:)
action:
@selector
(
captureScreen
:)
keyEquivalent
:
@""
keyEquivalent
:
@""
atIndex
:
contextualMenu
.
itemArray
.
count
];
atIndex
:
contextualMenu
.
itemArray
.
count
];
#if 0
// TODO: add file as a source
[
contextualMenu
addItem
:[
NSMenuItem
separatorItem
]];
[
contextualMenu
addItem
:[
NSMenuItem
separatorItem
]];
[
contextualMenu
insertItemWithTitle
:
NSLocalizedString
(
@"Choose file"
,
@"Contextual menu entry"
)
[
contextualMenu
insertItemWithTitle
:
NSLocalizedString
(
@"Choose file"
,
@"Contextual menu entry"
)
action:
@selector
(
chooseFile
:)
action:
@selector
(
chooseFile
:)
keyEquivalent
:
@""
keyEquivalent
:
@""
atIndex
:
contextualMenu
.
itemArray
.
count
];
atIndex
:
contextualMenu
.
itemArray
.
count
];
#endif
auto
menuItem
=
[
contextualMenu
itemWithTitle
:
currentDevice
];
auto
menuItem
=
[
contextualMenu
itemWithTitle
:
currentDevice
];
if
(
menuItem
)
{
if
(
menuItem
)
{
...
@@ -270,7 +263,8 @@ NSString *currentDevice;
...
@@ -270,7 +263,8 @@ NSString *currentDevice;
[
browsePanel
beginSheetModalForWindow
:[
self
window
]
completionHandler
:
^
(
NSInteger
result
)
{
[
browsePanel
beginSheetModalForWindow
:[
self
window
]
completionHandler
:
^
(
NSInteger
result
)
{
if
(
result
==
NSFileHandlingPanelOKButton
)
{
if
(
result
==
NSFileHandlingPanelOKButton
)
{
NSURL
*
theDoc
=
[[
browsePanel
URLs
]
objectAtIndex
:
0
];
NSURL
*
theDoc
=
[[
browsePanel
URLs
]
objectAtIndex
:
0
];
[
self
.
callDelegate
switchToFile
:
[
theDoc
.
path
UTF8String
]];
auto
name
=
QString
::
fromNSString
([
@"file:///"
stringByAppendingString
:
theDoc
.
path
]);
[
self
.
callDelegate
switchToFile
:
name
];
}
}
}];
}];
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment