Merge branch 'master' into bug2080

This commit is contained in:
Axel Uhl committed 2014-07-27 13:56:53 +02:00
commit c7b2aac868
93 files changed
+1050 -223

No files matched your search

@@ -558,7 +558,7 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport
private void loadMediaLibary() {
Collection<DBMediaTrack> allDBMediaTracks = mediaDB.loadAllMediaTracks();
for (DBMediaTrack dbMediaTrack : allDBMediaTracks) {
MimeType mimeType = dbMediaTrack.mimeType != null ? MimeType.valueOf(dbMediaTrack.mimeType) : null;
MimeType mimeType = dbMediaTrack.mimeType != null ? MimeType.byName(dbMediaTrack.mimeType) : null;
MediaTrack mediaTrack = new MediaTrack(dbMediaTrack.dbId, dbMediaTrack.title, dbMediaTrack.url,
dbMediaTrack.startTime, dbMediaTrack.durationInMillis, mimeType);
mediaTrackAdded(mediaTrack);