X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=92fe18f07591f134270035c2845040efc3b070b8;hp=441f4d7ea667d4fed60c0f7ecb4a87b5a18ae1c5;hb=17d2533cafc67dd0509860fa2b59ec98b23d7be7;hpb=a551870e3ac31ff77e1757f226d3e307e4ef83fc diff --git a/command.c b/command.c index 441f4d7e..92fe18f0 100644 --- a/command.c +++ b/command.c @@ -95,38 +95,6 @@ static char *vss_get_status_flags(unsigned int flags) return msg; } -/* - * compute status bar string. Never returns NULL - */ -static char *get_sb_string(struct misc_meta_data *nmmd) -{ - char *base, *ret; - long long unsigned secs = 0, rsecs = 0, percent = 0; - - base = para_basename(nmmd->filename); - if (!base) - return para_strdup(""); - if (!base[0]) - return base; - if (nmmd->afi.chunks_total) { - secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent - / nmmd->afi.chunks_total; - rsecs = (long long) nmmd->afi.seconds_total * - (nmmd->afi.chunks_total - nmmd->chunks_sent) - / nmmd->afi.chunks_total; - percent = 100 * ((nmmd->chunks_sent + 5) / 10) - / ((nmmd->afi.chunks_total + 5) / 10); - } - ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s", - secs / 60, secs % 60, - rsecs / 60, rsecs % 60, - percent, - base - ); - free(base); - return ret; -} - static char *get_status(struct misc_meta_data *nmmd) { char *bar, *ret, mtime[30] = ""; @@ -341,61 +309,6 @@ int com_version(int fd, int argc, __a_unused char * const * argv) ); } -/* sc */ -int com_sc(int fd, int argc, char * const * argv) -{ - char *name = NULL; - int ret, old = 0, count = -1; /* print af change forever */ - - if (argc > 1) - count = atoi(argv[1]); -repeat: - mmd_lock(); - if (old != mmd->num_played) { - old = mmd->num_played; - name = para_strdup(mmd->filename); - } - mmd_unlock(); - if (name) { - ret = send_va_buffer(fd, "%s\n", name); - free(name); - name = NULL; - if (ret < 0) - return ret; - if (argc > 1 && !--count) - return 1; - } - usleep(500000); - goto repeat; -} - -/* sb */ -int com_sb(int fd, int argc, char * const * argv) -{ - char *sb; - int ret, nr = -1; /* status bar will be printed that many - * times. Negative value means: print - * forever - */ - if (argc > 1) - nr = atoi(argv[1]); - while (nr) { - mmd_lock(); - sb = get_sb_string(mmd); - mmd_unlock(); - ret = send_va_buffer(fd, "%s\n", sb); - free(sb); - if (ret < 0) - return ret; - if (nr == 1) - return 1; - usleep(500000); - if (nr > 0) - nr--; - } - return 1; -} - /* stat */ int com_stat(int fd, int argc, char * const * argv) {