diff options
author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-03-13 22:09:51 +0000 |
---|---|---|
committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-03-13 22:09:51 +0000 |
commit | e684e36180607fac573e7c42135404e287a5fc9a (patch) | |
tree | e9a94850730299333de98b443b2f76edeede6590 | |
parent | da77d3f784f5f359cfd15c40a08deac370f93a30 (diff) | |
download | xine-lib-e684e36180607fac573e7c42135404e287a5fc9a.tar.gz xine-lib-e684e36180607fac573e7c42135404e287a5fc9a.tar.bz2 |
turn these around so that dvd_get_current_position is defined before used
CVS patchset: 4400
CVS date: 2003/03/13 22:09:51
-rw-r--r-- | src/input/input_dvd.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index e940c6abe..3d5df6572 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.133 2003/03/12 13:28:12 mroi Exp $ + * $Id: input_dvd.c,v 1.134 2003/03/13 22:09:51 mroi Exp $ * */ @@ -682,19 +682,6 @@ static off_t dvd_plugin_read (input_plugin_t *this_gen, char *ch_buf, off_t len) return 1; } -static off_t dvd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { - dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; - - trace_print("Called\n"); - - if(!this || !this->dvdnav) { - return -1; - } - - dvdnav_sector_search(this->dvdnav, offset / DVD_BLOCK_SIZE , origin); - return dvd_plugin_get_current_pos(this_gen); -} - static off_t dvd_plugin_get_current_pos (input_plugin_t *this_gen){ dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; uint32_t pos=0; @@ -709,6 +696,19 @@ static off_t dvd_plugin_get_current_pos (input_plugin_t *this_gen){ return (off_t)pos * (off_t)DVD_BLOCK_SIZE; } +static off_t dvd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { + dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; + + trace_print("Called\n"); + + if(!this || !this->dvdnav) { + return -1; + } + + dvdnav_sector_search(this->dvdnav, offset / DVD_BLOCK_SIZE , origin); + return dvd_plugin_get_current_pos(this_gen); +} + static off_t dvd_plugin_get_length (input_plugin_t *this_gen) { dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; uint32_t pos=0; @@ -1567,6 +1567,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.134 2003/03/13 22:09:51 mroi + * turn these around so that dvd_get_current_position is defined before used + * * Revision 1.133 2003/03/12 13:28:12 mroi * fix wrong return value of seek function, kindly reported by Nick Kurshev * |