libdvdnav.hg: searching.c comparison

comparison searching.c @ 193:b80dff4bef76 src

Remove all references to S_OK and S_ERR. DVDNAV_STATUS_OK will always be 1. DVDNAV_STATUS_ERR will always be 0.

author	jcdutton
date	Sun, 11 May 2003 00:25:24 +0000
parents	5d9770cb2961
children	6b1bfe8f5283

comparison

equal deleted inserted replaced

-:a3d7b149cc0f
+:b80dff4bef76
 /* Searching API calls */
 dvdnav_status_t dvdnav_time_search(dvdnav_t *this,
 				   unsigned long int time) {
 /* FIXME: Time search the current PGC based on the xxx table */
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 /* Scan the ADMAP for a particular block number. */
 /* Return placed in vobu. */
 /* Returns error status */
 }
 address ++;
 }
 if(found) {
 *vobu = vobu_start;
-return S_OK;
+return DVDNAV_STATUS_OK;
 } else {
 fprintf(MSG_OUT, "libdvdnav: Could not locate block\n");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 }
 fprintf(MSG_OUT, "libdvdnav: admap not located\n");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 dvdnav_status_t dvdnav_sector_search(dvdnav_t *this,
 				     unsigned long int offset, int origin) {
 uint32_t target = 0;
 dvd_state_t *state;
 dvdnav_status_t result;
 if(this->position_current.still != 0) {
 printerr("Cannot seek in a still frame.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 result = dvdnav_get_position(this, &target, &length);
 if(!result) {
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 pthread_mutex_lock(&this->vm_lock);
 state = &(this->vm->state);
 if(!state->pgc) {
 printerr("No current PGC.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: seeking to offset=%lu pos=%u length=%u\n", offset, target, length);
 fprintf(MSG_OUT, "libdvdnav: Before cellN=%u blockN=%u\n", state->cellN, state->blockN);
 #endif
 switch(origin) {
 case SEEK_SET:
 if(offset > length) {
 printerr("Request to seek behind end.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 target = offset;
 break;
 case SEEK_CUR:
 if(target + offset > length) {
 printerr("Request to seek behind end.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 target += offset;
 break;
 case SEEK_END:
 if(length - offset < 0) {
 printerr("Request to seek before start.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 target = length - offset;
 break;
 default:
 /* Error occured */
 printerr("Illegal seek mode.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 if (this->pgc_based) {
 first_cell_nr = 1;
 last_cell_nr = state->pgc->nr_of_cells;
 int32_t vobu;
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: Seeking to cell %i from choice of %i to %i\n",
 	    cell_nr, first_cell_nr, last_cell_nr);
 #endif
-if (dvdnav_scan_admap(this, state->domain, target, &vobu) == S_OK) {
+if (dvdnav_scan_admap(this, state->domain, target, &vobu) == DVDNAV_STATUS_OK) {
 int32_t start = state->pgc->cell_playback[cell_nr-1].first_sector;
 if (vm_jump_cell_block(this->vm, cell_nr, vobu - start)) {
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: After cellN=%u blockN=%u target=%x vobu=%x start=%x\n" ,
 state->cellN, state->blockN, target, vobu, start);
 #endif
 this->vm->hop_channel += HOP_SEEK;
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 }
 }
 fprintf(MSG_OUT, "libdvdnav: Error when seeking\n");
 fprintf(MSG_OUT, "libdvdnav: FIXME: Implement seeking to location %u\n", target);
 printerr("Error when seeking.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 dvdnav_status_t dvdnav_part_search(dvdnav_t *this, int part) {
 int title, old_part;
-if (dvdnav_current_title_info(this, &title, &old_part) == S_OK)
+if (dvdnav_current_title_info(this, &title, &old_part) == DVDNAV_STATUS_OK)
 return dvdnav_part_play(this, title, part);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 dvdnav_status_t dvdnav_prev_pg_search(dvdnav_t *this) {
 if(!this) {
 printerr("Passed a NULL pointer.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 pthread_mutex_lock(&this->vm_lock);
 if(!this->vm->state.pgc) {
 printerr("No current PGC.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: previous chapter\n");
 #endif
 if (!vm_jump_prev_pg(this->vm)) {
 fprintf(MSG_OUT, "libdvdnav: previous chapter failed.\n");
 printerr("Skip to previous chapter failed.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 this->position_current.still = 0;
 this->vm->hop_channel++;
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: previous chapter done\n");
 #endif
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 dvdnav_status_t dvdnav_top_pg_search(dvdnav_t *this) {
 if(!this) {
 printerr("Passed a NULL pointer.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 pthread_mutex_lock(&this->vm_lock);
 if(!this->vm->state.pgc) {
 printerr("No current PGC.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: top chapter\n");
 #endif
 if (!vm_jump_top_pg(this->vm)) {
 fprintf(MSG_OUT, "libdvdnav: top chapter failed.\n");
 printerr("Skip to top chapter failed.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 this->position_current.still = 0;
 this->vm->hop_channel++;
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: top chapter done\n");
 #endif
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 dvdnav_status_t dvdnav_next_pg_search(dvdnav_t *this) {
 vm_t *try_vm;
 if(!this) {
 printerr("Passed a NULL pointer.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 pthread_mutex_lock(&this->vm_lock);
 if(!this->vm->state.pgc) {
 printerr("No current PGC.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: next chapter\n");
 #endif
 if (try_vm->stopped) {
 vm_free_copy(try_vm);
 fprintf(MSG_OUT, "libdvdnav: next chapter failed.\n");
 printerr("Skip to next chapter failed.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 }
 /* merge changes on success */
 vm_merge(this->vm, try_vm);
 vm_free_copy(try_vm);
 #ifdef LOG_DEBUG
 fprintf(MSG_OUT, "libdvdnav: next chapter done\n");
 #endif
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 dvdnav_status_t dvdnav_menu_call(dvdnav_t *this, DVDMenuID_t menu) {
 vm_t *try_vm;
 if(!this) {
 printerr("Passed a NULL pointer.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 pthread_mutex_lock(&this->vm_lock);
 if(!this->vm->state.pgc) {
 printerr("No current PGC.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 /* make a copy of current VM and try to navigate the copy to the menu */
 try_vm = vm_new_copy(this->vm);
 if ( (menu == DVD_MENU_Escape) && (this->vm->state.domain != VTS_DOMAIN)) {
 vm_merge(this->vm, try_vm);
 vm_free_copy(try_vm);
 this->position_current.still = 0;
 this->vm->hop_channel++;
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 }
 if (menu == DVD_MENU_Escape) menu = DVD_MENU_Root;
 if (vm_jump_menu(try_vm, menu) && !try_vm->stopped) {
 vm_merge(this->vm, try_vm);
 vm_free_copy(try_vm);
 this->position_current.still = 0;
 this->vm->hop_channel++;
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 } else {
 vm_free_copy(try_vm);
 printerr("No such menu or menu not reachable.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 }
 dvdnav_status_t dvdnav_get_position(dvdnav_t *this, unsigned int *pos,
 				    unsigned int *len) {
 cell_playback_t *cell;
 dvd_state_t *state;
 if(!this || !pos || !len) {
 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;
 }
 pthread_mutex_lock(&this->vm_lock);
 state = &(this->vm->state);
 if(!state->pgc) {
 printerr("No current PGC.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 if (this->position_current.hop_channel  != this->vm->hop_channel ||
 this->position_current.domain       != state->domain         ||
 this->position_current.vts          != state->vtsN           ||
 this->position_current.cell_restart != state->cell_restart) {
 printerr("New position not yet determined.");
 pthread_mutex_unlock(&this->vm_lock);
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 /* Get current sector */
 cur_sector = this->vobu.vobu_start + this->vobu.blockN;
 assert((signed)*pos != -1);
 pthread_mutex_unlock(&this->vm_lock);
-return S_OK;
+return DVDNAV_STATUS_OK;
 }
 dvdnav_status_t dvdnav_get_position_in_title(dvdnav_t *this,
 					     unsigned int *pos,
 					     unsigned int *len) {
 cell_playback_t *last_cell;
 dvd_state_t *state;
 if(!this || !pos || !len) {
 printerr("Passed a NULL pointer.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 state = &(this->vm->state);
 if(!state->pgc) {
 printerr("No current PGC.");
-return S_ERR;
+return DVDNAV_STATUS_ERR;
 }
 /* Get current sector */
 cur_sector = this->vobu.vobu_start + this->vobu.blockN;
 last_cell = &(state->pgc->cell_playback[last_cell_nr-1]);
 *pos = cur_sector - first_cell->first_sector;
 *len = last_cell->last_sector - first_cell->first_sector;
-return S_OK;
+return DVDNAV_STATUS_OK;
 }

Mercurial > libdvdnav.hg

comparison searching.c @ 193:b80dff4bef76 src