Mercurial > audlegacy-plugins
comparison src/madplug/plugin.c @ 1744:46cda76dcd2a
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Wed, 19 Sep 2007 09:06:52 -0500 |
| parents | e1ebf3fc1a16 |
| children | 5fa26178eaef |
comparison
equal
deleted
inserted
replaced
| 1743:3572d3444a7c | 1744:46cda76dcd2a |
|---|---|
| 518 if (input_get_info(&myinfo, info.remote ? TRUE : audmad_config.fast_play_time_calc) == TRUE) { | 518 if (input_get_info(&myinfo, info.remote ? TRUE : audmad_config.fast_play_time_calc) == TRUE) { |
| 519 if(tuple_get_string(myinfo.tuple, -1, "track-name")) | 519 if(tuple_get_string(myinfo.tuple, -1, "track-name")) |
| 520 *title = g_strdup(tuple_get_string(myinfo.tuple, -1, "track-name")); | 520 *title = g_strdup(tuple_get_string(myinfo.tuple, -1, "track-name")); |
| 521 else | 521 else |
| 522 *title = g_strdup(url); | 522 *title = g_strdup(url); |
| 523 if(tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL) == -1) | 523 |
| 524 *length = tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL); | |
| 525 if(*length == -1) | |
| 524 *length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS); | 526 *length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS); |
| 525 else | |
| 526 *length = tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL); | |
| 527 } | 527 } |
| 528 else { | 528 else { |
| 529 *title = g_strdup(url); | 529 *title = g_strdup(url); |
| 530 *length = -1; | 530 *length = -1; |
| 531 } | 531 } |
| 551 #endif | 551 #endif |
| 552 return; | 552 return; |
| 553 } | 553 } |
| 554 | 554 |
| 555 if (input_get_info(&myinfo, info.remote ? TRUE : audmad_config.fast_play_time_calc) == TRUE) { | 555 if (input_get_info(&myinfo, info.remote ? TRUE : audmad_config.fast_play_time_calc) == TRUE) { |
| 556 if(tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL) == -1) | 556 *length = tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL); |
| 557 if(*length == -1) | |
| 557 *length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS); | 558 *length = mad_timer_count(myinfo.duration, MAD_UNITS_MILLISECONDS); |
| 558 else | |
| 559 *length = tuple_get_int(myinfo.tuple, FIELD_LENGTH, NULL); | |
| 560 } | 559 } |
| 561 else { | 560 else { |
| 562 *length = -1; | 561 *length = -1; |
| 563 } | 562 } |
| 564 input_term(&myinfo); | 563 input_term(&myinfo); |
