added MediaType enum literal case statements for image and unknown;

my impression is that so far, MediaType was primarily for video source identification, not for images; this may be a mismatch

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaType.java
This commit is contained in:
Axel Uhl committed 2015-05-30 07:03:07 +02:00
1 parent ecb4ac2ccb
commit e13d2232a2
2 files changed
+22 -4

No files matched your search

@@ -165,10 +165,8 @@ public class DomainFactoryImpl extends SharedDomainFactoryImpl implements Domain
public TrackedRaceStatisticsDTO createTrackedRaceStatisticsDTO(TrackedRace trackedRace, Leaderboard leaderboard,
RaceColumn raceColumn, Fleet fleet, Collection<MediaTrack> mediaTracks) {
TrackedRaceStatisticsDTO statisticsDTO = new TrackedRaceStatisticsDTO();
// GPS data
statisticsDTO.hasGPSData = trackedRace.hasGPSData();
Competitor leaderOrWinner = null;
TimePoint now = MillisecondsTimePoint.now();
try {
@@ -212,11 +210,19 @@ public class DomainFactoryImpl extends SharedDomainFactoryImpl implements Domain
switch (track.mimeType.mediaType) {
case audio:
statisticsDTO.hasAudioData = true;
statisticsDTO.audioTracksCount = statisticsDTO.audioTracksCount == null ? 1 : statisticsDTO.audioTracksCount++;
statisticsDTO.audioTracksCount = statisticsDTO.audioTracksCount == null ? 1
: statisticsDTO.audioTracksCount++;
break;
case video:
statisticsDTO.hasVideoData = true;
statisticsDTO.videoTracksCount = statisticsDTO.videoTracksCount == null ? 1 : statisticsDTO.videoTracksCount++;
statisticsDTO.videoTracksCount = statisticsDTO.videoTracksCount == null ? 1
: statisticsDTO.videoTracksCount++;
break;
case image: // TODO should this add to an image count?
break;
case unknown: // TODO should this add to an "unknown media" count? Probably not
break;
default:
break;
}
}
@@ -123,6 +123,12 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem
} else {
reachableAudioTracks.add(mediaTrack);
}
case image: // no image media tracks produced by an image
break;
case unknown: // we won't overlay an unknown media source
break;
default:
break;
}
}
}
@@ -144,6 +150,12 @@ public class MediaManagementControl extends AbstractMediaSelectionControl implem
} else {
reachableAudioTracks.add(mediaTrack);
}
case image: // images don't play as video tracks
break;
case unknown: // unknown formats won't be played either
break;
default:
break;
}
}
}