summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/navigation.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/input/libdvdnav/navigation.c')
-rw-r--r--src/input/libdvdnav/navigation.c86
1 files changed, 43 insertions, 43 deletions
diff --git a/src/input/libdvdnav/navigation.c b/src/input/libdvdnav/navigation.c
index 07d4a2759..ee79f1d45 100644
--- a/src/input/libdvdnav/navigation.c
+++ b/src/input/libdvdnav/navigation.c
@@ -17,7 +17,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: navigation.c,v 1.8 2003/04/07 18:10:50 mroi Exp $
+ * $Id: navigation.c,v 1.9 2003/05/11 13:44:05 jcdutton Exp $
*
*/
@@ -32,7 +32,7 @@
dvdnav_status_t dvdnav_still_skip(dvdnav_t *this) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
this->position_current.still = 0;
@@ -40,25 +40,25 @@ dvdnav_status_t dvdnav_still_skip(dvdnav_t *this) {
this->sync_wait = 0;
this->sync_wait_skip = 1;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_wait_skip(dvdnav_t *this) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
this->sync_wait = 0;
this->sync_wait_skip = 1;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
-dvdnav_status_t dvdnav_get_number_of_titles(dvdnav_t *this, int *titles) {
+dvdnav_status_t dvdnav_get_number_of_titles(dvdnav_t *this, int32_t *titles) {
if(!this || !titles) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if(!this->started) {
@@ -69,46 +69,46 @@ dvdnav_status_t dvdnav_get_number_of_titles(dvdnav_t *this, int *titles) {
(*titles) = vm_get_vmgi(this->vm)->tt_srpt->nr_of_srpts;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
-dvdnav_status_t dvdnav_get_number_of_parts(dvdnav_t *this, int title, int *parts) {
+dvdnav_status_t dvdnav_get_number_of_parts(dvdnav_t *this, int32_t title, int32_t *parts) {
if(!this || !parts) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if(!this->started) {
printerr("Virtual DVD machine not started.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if ((title < 1) || (title > vm_get_vmgi(this->vm)->tt_srpt->nr_of_srpts) ) {
printerr("Passed a title number out of range.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
(*parts) = vm_get_vmgi(this->vm)->tt_srpt->title[title-1].nr_of_ptts;
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
-dvdnav_status_t dvdnav_current_title_info(dvdnav_t *this, int *title, int *part) {
- int retval;
+dvdnav_status_t dvdnav_current_title_info(dvdnav_t *this, int32_t *title, int32_t *part) {
+ int32_t retval;
if(!this || !title || !part) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
if (!this->vm->vtsi || !this->vm->vmgi) {
printerr("Bad VM state.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if (!this->vm->state.pgc) {
printerr("No current PGC.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if ( (this->vm->state.domain == VTSM_DOMAIN)
|| (this->vm->state.domain == VMGM_DOMAIN) ) {
@@ -117,55 +117,55 @@ dvdnav_status_t dvdnav_current_title_info(dvdnav_t *this, int *title, int *part)
if (*part > -1) {
*title = 0;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
}
if (this->vm->state.domain == VTS_DOMAIN) {
retval = vm_get_current_title_part(this->vm, title, part);
pthread_mutex_unlock(&this->vm_lock);
- return retval ? S_OK : S_ERR;
+ return retval ? DVDNAV_STATUS_OK : DVDNAV_STATUS_ERR;
}
printerr("Not in a title or menu.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
-dvdnav_status_t dvdnav_title_play(dvdnav_t *this, int title) {
+dvdnav_status_t dvdnav_title_play(dvdnav_t *this, int32_t title) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
return dvdnav_part_play(this, title, 1);
}
-dvdnav_status_t dvdnav_part_play(dvdnav_t *this, int title, int part) {
- int retval;
+dvdnav_status_t dvdnav_part_play(dvdnav_t *this, int32_t title, int32_t part) {
+ int32_t retval;
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
if (!this->vm->vmgi) {
printerr("Bad VM state.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if (!this->vm->state.pgc) {
printerr("No current PGC.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if((title < 1) || (title > this->vm->vmgi->tt_srpt->nr_of_srpts)) {
printerr("Title out of range.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
if((part < 1) || (part > this->vm->vmgi->tt_srpt->title[title-1].nr_of_ptts)) {
printerr("Part out of range.");
pthread_mutex_unlock(&this->vm_lock);
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
retval = vm_jump_title_part(this->vm, title, part);
@@ -173,45 +173,45 @@ dvdnav_status_t dvdnav_part_play(dvdnav_t *this, int title, int part) {
this->vm->hop_channel++;
pthread_mutex_unlock(&this->vm_lock);
- return retval ? S_OK : S_ERR;
+ return retval ? DVDNAV_STATUS_OK : DVDNAV_STATUS_ERR;
}
-dvdnav_status_t dvdnav_part_play_auto_stop(dvdnav_t *this, int title,
- int part, int parts_to_play) {
+dvdnav_status_t dvdnav_part_play_auto_stop(dvdnav_t *this, int32_t title,
+ int32_t part, int32_t parts_to_play) {
/* FIXME: Implement auto-stop */
- if (dvdnav_part_play(this, title, part) == S_OK)
+ if (dvdnav_part_play(this, title, part) == DVDNAV_STATUS_OK)
printerr("Not implemented yet.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
-dvdnav_status_t dvdnav_time_play(dvdnav_t *this, int title,
- unsigned long int time) {
+dvdnav_status_t dvdnav_time_play(dvdnav_t *this, int32_t title,
+ uint64_t time) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* FIXME: Implement */
printerr("Not implemented yet.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
dvdnav_status_t dvdnav_stop(dvdnav_t *this) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
pthread_mutex_lock(&this->vm_lock);
this->vm->stopped = 1;
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
dvdnav_status_t dvdnav_go_up(dvdnav_t *this) {
if(!this) {
printerr("Passed a NULL pointer.");
- return S_ERR;
+ return DVDNAV_STATUS_ERR;
}
/* A nice easy function... delegate to the VM */
@@ -219,5 +219,5 @@ dvdnav_status_t dvdnav_go_up(dvdnav_t *this) {
vm_jump_up(this->vm);
pthread_mutex_unlock(&this->vm_lock);
- return S_OK;
+ return DVDNAV_STATUS_OK;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 09:48:45 +0000