Changeset 5b881fc1b692b3d3cbc3b304bec7dbf879cfca56
- Timestamp:
- 09/07/03 03:30:41
(5 years ago)
- Author:
- Derk-Jan Hartman <hartman@videolan.org>
- git-committer:
- Derk-Jan Hartman <hartman@videolan.org> 1057714241 +0000
- git-parent:
[56dd78bd1f54651d7cc9623c8c723c73d727e3ad]
- git-author:
- Derk-Jan Hartman <hartman@videolan.org> 1057714241 +0000
- Message:
* Update next/previous item routines. it descends from next chapter to
next title to next playlistitem. The old code for this was buggy. This
should work better. Especially for CDDA's, since we previously didn't support
titles.
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r14682ad |
r5b881fc |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2002-2003 VideoLAN |
|---|
| 5 | | * $Id: controls.m,v 1.43 2003/06/30 01:52:57 hartman Exp $ |
|---|
| | 5 | * $Id: controls.m,v 1.44 2003/07/09 01:30:41 hartman Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> |
|---|
| … | … | |
| 159 | 159 | var_Get( p_playlist->p_input, "prev-chapter", &val ); |
|---|
| 160 | 160 | var_Set( p_playlist->p_input, "prev-chapter", val ); |
|---|
| 161 | | |
|---|
| 162 | | p_intf->p_sys->b_input_update = VLC_TRUE; |
|---|
| 163 | 161 | } |
|---|
| 164 | 162 | else if( p_area->i_id > 1 ) |
|---|
| … | … | |
| 168 | 166 | var_Get( p_playlist->p_input, "prev-title", &val ); |
|---|
| 169 | 167 | var_Set( p_playlist->p_input, "prev-title", val ); |
|---|
| 170 | | |
|---|
| 171 | | p_intf->p_sys->b_input_update = VLC_TRUE; |
|---|
| 172 | 168 | } |
|---|
| 173 | 169 | else |
|---|
| … | … | |
| 208 | 204 | if( p_area->i_part < p_area->i_part_nb && p_area->i_part_nb > 1 ) |
|---|
| 209 | 205 | { |
|---|
| | 206 | NSLog(@"next-chapter: %d, all: %d", p_area->i_part, p_area->i_part_nb); |
|---|
| 210 | 207 | vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); |
|---|
| 211 | 208 | vlc_mutex_unlock( &p_playlist->object_lock ); |
|---|
| 212 | 209 | var_Get( p_playlist->p_input, "next-chapter", &val ); |
|---|
| 213 | 210 | var_Set( p_playlist->p_input, "next-chapter", val ); |
|---|
| 214 | | |
|---|
| 215 | | p_intf->p_sys->b_input_update = VLC_TRUE; |
|---|
| 216 | | } |
|---|
| 217 | | else if( p_area->i_id < p_playlist->p_input->stream.i_area_nb ) |
|---|
| 218 | | { |
|---|
| | 211 | } |
|---|
| | 212 | else if( p_area->i_id < p_playlist->p_input->stream.i_area_nb && p_playlist->p_input->stream.i_area_nb > 1 ) |
|---|
| | 213 | { |
|---|
| | 214 | NSLog(@"next-title: %d, all: %d", p_area->i_id, p_playlist->p_input->stream.i_area_nb ); |
|---|
| 219 | 215 | vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); |
|---|
| 220 | 216 | vlc_mutex_unlock( &p_playlist->object_lock ); |
|---|
| 221 | 217 | var_Get( p_playlist->p_input, "next-title", &val ); |
|---|
| 222 | 218 | var_Set( p_playlist->p_input, "next-title", val ); |
|---|
| 223 | | |
|---|
| 224 | | p_intf->p_sys->b_input_update = VLC_TRUE; |
|---|
| 225 | 219 | } |
|---|
| 226 | 220 | else |
|---|
| 227 | 221 | { |
|---|
| | 222 | NSLog(@"next-item"); |
|---|
| 228 | 223 | vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); |
|---|
| 229 | 224 | vlc_mutex_unlock( &p_playlist->object_lock ); |
|---|