dvd: move angle switching code

No need to provide a "nice" API for it; just do this stuff directly in
the command code.

2 files changed, 0 insertions, 46 deletions

diff --git a/demux/demux.c b/demux/demux.c
index d6aff6d858..63b936b820 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -732,42 +732,3 @@ double demuxer_get_time_length(struct demuxer *demuxer)
         return len;
     return -1;
 }
-
-int demuxer_angles_count(demuxer_t *demuxer)
-{
-    int ris, angles = -1;
-
-    ris = stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_ANGLES, &angles);
-    if (ris == STREAM_UNSUPPORTED)
-        return -1;
-    return angles;
-}
-
-int demuxer_get_current_angle(demuxer_t *demuxer)
-{
-    int ris, curr_angle = -1;
-    ris = stream_control(demuxer->stream, STREAM_CTRL_GET_ANGLE, &curr_angle);
-    if (ris == STREAM_UNSUPPORTED)
-        return -1;
-    return curr_angle;
-}
-
-
-int demuxer_set_angle(demuxer_t *demuxer, int angle)
-{
-    int ris, angles = -1;
-
-    angles = demuxer_angles_count(demuxer);
-    if ((angles < 1) || (angle > angles))
-        return -1;
-
-    demux_flush(demuxer);
-
-    ris = stream_control(demuxer->stream, STREAM_CTRL_SET_ANGLE, &angle);
-    if (ris == STREAM_UNSUPPORTED)
-        return -1;
-
-    demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL);
-
-    return angle;
-}
diff --git a/demux/demux.h b/demux/demux.h
index 56ac02ae88..1a639794eb 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -263,13 +263,6 @@ int demuxer_add_chapter(struct demuxer *demuxer, struct bstr name,
 
 double demuxer_get_time_length(struct demuxer *demuxer);
 
-/// Get current angle index.
-int demuxer_get_current_angle(struct demuxer *demuxer);
-/// Set angle.
-int demuxer_set_angle(struct demuxer *demuxer, int angle);
-/// Get number of angles.
-int demuxer_angles_count(struct demuxer *demuxer);
-
 struct sh_stream *demuxer_stream_by_demuxer_id(struct demuxer *d,
                                                enum stream_type t, int id);