Skip to content

Commit

Permalink
Add defaultSorting.
Browse files Browse the repository at this point in the history
  • Loading branch information
cloudwebrtc committed Oct 26, 2024
1 parent 8e5f081 commit 0d3098c
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 7 deletions.
4 changes: 4 additions & 0 deletions lib/src/context/participant_context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,8 @@ class ParticipantContext extends ChangeNotifier {
List<TranscriptionSegment> get segments => _segments;

ParticipantKind get kind => _participant.kind;

DateTime? get lastSpokeAt => _participant.lastSpokeAt;

double get audioLevel => _participant.audioLevel;
}
13 changes: 6 additions & 7 deletions lib/src/ui/builder/participant/participant_loop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ import '../../../debug/logger.dart';
import '../../../types/track_identifier.dart';
import '../../layout/grid_layout.dart';
import '../../layout/layouts.dart';
import '../../layout/sorting.dart';
import 'participant_track.dart';

class ParticipantLoop extends StatelessWidget {
const ParticipantLoop({
super.key,
required this.participantBuilder,
this.layoutBuilder = const GridLayoutBuilder(),
this.sorting,
this.sorting = defaultSorting,
this.showAudioTracks = false,
this.showVideoTracks = true,
});

final WidgetBuilder participantBuilder;
final List<MapEntry<TrackIdentifier, TrackPublication?>> Function(
List<MapEntry<TrackIdentifier, TrackPublication?>> tracks)? sorting;
final List<TrackWidget> Function(List<TrackWidget> tracks)? sorting;
final ParticipantLayoutBuilder layoutBuilder;

final bool showAudioTracks;
Expand Down Expand Up @@ -76,10 +76,6 @@ class ParticipantLoop extends StatelessWidget {
var trackMap = buildTracksMap(
showAudioTracks, showVideoTracks, participants);

if (sorting != null) {
trackMap = sorting!(trackMap);
}

for (var item in trackMap) {
var identifier = item.key;
var track = item.value;
Expand All @@ -106,6 +102,9 @@ class ParticipantLoop extends StatelessWidget {
);
}
}
if (sorting != null) {
trackWidgets = sorting!(trackWidgets);
}
return Selector<RoomContext, List<String>>(
selector: (context, pinnedTracks) => roomCtx.pinnedTracks,
builder: (context, pinnedTracks, child) {
Expand Down
50 changes: 50 additions & 0 deletions lib/src/ui/layout/sorting.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import 'package:livekit_client/livekit_client.dart';

import 'layouts.dart';

List<TrackWidget> defaultSorting(List<TrackWidget> trackWidgets) {
List<TrackWidget> trackWidgetsSorted = [];

/// sort screen shares and local participant first
for (var element in trackWidgets) {
if (element.trackIdentifier.track?.isScreenShare == true ||
element.trackIdentifier.participant is LocalParticipant) {
trackWidgetsSorted.insert(0, element);
} else {
trackWidgetsSorted.add(element);
}
}

// sort speakers for the grid
trackWidgetsSorted.sort((a, b) {
// loudest speaker first
var participantA = a.trackIdentifier.participant;
var participantB = b.trackIdentifier.participant;
if (participantA.isSpeaking && participantB.isSpeaking) {
if (participantA.audioLevel > participantB.audioLevel) {
return -1;
} else {
return 1;
}
}

// last spoken at
final aSpokeAt = participantA.lastSpokeAt?.millisecondsSinceEpoch ?? 0;
final bSpokeAt = participantB.lastSpokeAt?.millisecondsSinceEpoch ?? 0;

if (aSpokeAt != bSpokeAt) {
return aSpokeAt > bSpokeAt ? -1 : 1;
}

// video on
if (participantA.hasVideo != participantB.hasVideo) {
return participantA.hasVideo ? -1 : 1;
}

// joinedAt
return participantA.joinedAt.millisecondsSinceEpoch -
participantB.joinedAt.millisecondsSinceEpoch;
});

return trackWidgetsSorted;
}

0 comments on commit 0d3098c

Please sign in to comment.