From 4d622cb27ab54dc081d81285128b9c70f8dd37ac Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Thu, 9 Oct 2014 20:38:15 +0200
Subject: Removed mp4 chapter support

---
 src/de/danoeh/antennapod/feed/MP4Chapter.java   | 27 ----------------
 src/de/danoeh/antennapod/storage/DBReader.java  |  3 --
 src/de/danoeh/antennapod/util/ChapterUtils.java | 41 -------------------------
 3 files changed, 71 deletions(-)
 delete mode 100644 src/de/danoeh/antennapod/feed/MP4Chapter.java

(limited to 'src/de/danoeh')

diff --git a/src/de/danoeh/antennapod/feed/MP4Chapter.java b/src/de/danoeh/antennapod/feed/MP4Chapter.java
deleted file mode 100644
index a5e1df393..000000000
--- a/src/de/danoeh/antennapod/feed/MP4Chapter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package de.danoeh.antennapod.feed;
-
-import wseemann.media.FFmpegChapter;
-
-/**
- * Represents a chapter contained in a MP4 file.
- */
-public class MP4Chapter extends Chapter {
-    public static final int CHAPTERTYPE_MP4CHAPTER = 4;
-
-    /**
-     * Construct a MP4Chapter from an FFmpegChapter.
-     */
-    public MP4Chapter(FFmpegChapter ch) {
-        this.start = ch.getStart();
-        this.title = ch.getTitle();
-    }
-
-    public MP4Chapter(long start, String title, FeedItem item, String link) {
-        super(start, title, item, link);
-    }
-
-    @Override
-    public int getChapterType() {
-        return CHAPTERTYPE_MP4CHAPTER;
-    }
-}
diff --git a/src/de/danoeh/antennapod/storage/DBReader.java b/src/de/danoeh/antennapod/storage/DBReader.java
index 0924c30ec..e49ea4f83 100644
--- a/src/de/danoeh/antennapod/storage/DBReader.java
+++ b/src/de/danoeh/antennapod/storage/DBReader.java
@@ -262,9 +262,6 @@ public final class DBReader {
                                     chapter = new VorbisCommentChapter(start,
                                             title, item, link);
                                     break;
-                                case MP4Chapter.CHAPTERTYPE_MP4CHAPTER:
-                                    chapter = new MP4Chapter(start, title, item, link);
-                                    break;
                             }
                             if (chapter != null) {
                                 chapter.setId(chapterCursor
diff --git a/src/de/danoeh/antennapod/util/ChapterUtils.java b/src/de/danoeh/antennapod/util/ChapterUtils.java
index 45fc9211c..2d9022eed 100644
--- a/src/de/danoeh/antennapod/util/ChapterUtils.java
+++ b/src/de/danoeh/antennapod/util/ChapterUtils.java
@@ -2,9 +2,7 @@ package de.danoeh.antennapod.util;
 
 import android.util.Log;
 
-import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -14,21 +12,17 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.MP4Chapter;
 import de.danoeh.antennapod.util.comparator.ChapterStartTimeComparator;
 import de.danoeh.antennapod.util.id3reader.ChapterReader;
 import de.danoeh.antennapod.util.id3reader.ID3ReaderException;
 import de.danoeh.antennapod.util.playback.Playable;
 import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentChapterReader;
 import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentReaderException;
-import wseemann.media.FFmpegChapter;
-import wseemann.media.FFmpegMediaMetadataRetriever;
 
 /**
  * Utility class for getting chapter data from media files.
@@ -205,32 +199,6 @@ public class ChapterUtils {
         }
     }
 
-    private static void readMP4ChaptersFromFileUrl(Playable p) {
-        if (!FFmpegMediaMetadataRetriever.LIB_AVAILABLE) {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "FFmpegMediaMetadataRetriever not available on this architecture");
-            return;
-        }
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "Trying to read mp4 chapters from file " + p.getEpisodeTitle());
-
-        FFmpegMediaMetadataRetriever retriever = new FFmpegMediaMetadataRetriever();
-        retriever.setDataSource(p.getLocalMediaUrl());
-        FFmpegChapter[] res = retriever.getChapters();
-        retriever.release();
-        if (res != null) {
-            List<Chapter> chapters = new ArrayList<Chapter>();
-            for (FFmpegChapter fFmpegChapter : res) {
-                chapters.add(new MP4Chapter(fFmpegChapter));
-            }
-            Collections.sort(chapters, new ChapterStartTimeComparator());
-            processChapters(chapters, p);
-            p.setChapters(chapters);
-        } else {
-            if (BuildConfig.DEBUG) Log.d(TAG, "No mp4 chapters found in " + p.getEpisodeTitle());
-        }
-    }
-
     /**
      * Makes sure that chapter does a title and an item attribute.
      */
@@ -299,17 +267,8 @@ public class ChapterUtils {
             if (media.getChapters() == null) {
                 ChapterUtils.readOggChaptersFromPlayableFileUrl(media);
             }
-            if (media.getChapters() == null && isMP4File(media)) {
-                ChapterUtils.readMP4ChaptersFromFileUrl(media);
-            }
         } else {
             Log.e(TAG, "Could not load chapters from file url: local file not available");
         }
     }
-
-    private static boolean isMP4File(Playable media) {
-        String ext = FilenameUtils.getExtension(media.getLocalMediaUrl());
-        return StringUtils.equals(ext, "m4a") || StringUtils.equals(ext, "mp4")
-                || StringUtils.equals(ext, "aac") || StringUtils.equals(ext, "m4p");
-    }
 }
-- 
cgit v1.2.3