Skip to content

Commit bb25b0d

Browse files
tarjanm-movidiustarjanm-movidius
committed
Bumped version, rewrote Makefile, added linenoise submodule
1 parent 61ba684 commit bb25b0d

File tree

7 files changed

+62
-44
lines changed

7 files changed

+62
-44
lines changed

‎.gitmodules

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "linenoise"]
2+
path = linenoise
3+
url = https://github.com/antirez/linenoise.git
4+
branch = master

‎Makefile

+47-36
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,55 @@
11
NAME=cutmp3
2-
VERSION=3.0.2
2+
VERSION=4.0
33
PREFIX?=/usr/local
4-
BINDIR=${PREFIX}/bin
5-
DATADIR=${PREFIX}/share
6-
MANDIR=${PREFIX}/share/man/man1
7-
DOCDIR=${DATADIR}/doc/${NAME}-${VERSION}
8-
CFLAGS?=-Wall
9-
#CFLAGS+=-DDEBUG
10-
11-
all:
12-
@echo -e "\n\n*** You need readline-devel, ncurses-devel or similar to compile ${NAME} ***\n*** Maybe you want to try the binary on compile failures? ***\n\n"
13-
gcc -O2 ${CFLAGS} -c mpglib.c
14-
gcc -O2 ${CFLAGS} -c main.c
15-
gcc main.o mpglib.o -o ${NAME} -lm -lreadline
16-
#-lncurses
17-
18-
i386:
19-
gcc -Wall -O2 -c mpglib.c
20-
gcc -Wall -O2 -c main.c
21-
gcc main.o mpglib.o -o ${NAME} -lm -lreadline
4+
BINDIR=$(PREFIX)/bin
5+
DATADIR=$(PREFIX)/share
6+
MANDIR=$(PREFIX)/share/man/man1
7+
DOCDIR=$(DATADIR)/doc/$(NAME)-$(VERSION)
8+
CC=gcc
9+
CFLAGS?=-Wall -O2
10+
LDFLAGS?=-lm -lreadline
11+
DBGFLAGS:=-DDEBUG -g
12+
LNSFLAGS:=-DLINENOISE
13+
OBJECTS:=main.o mpglib.o
14+
15+
.PHONY: clean debug install uninstall
16+
17+
all: $(NAME)
18+
debug: CFLAGS+=$(DBGFLAGS)
19+
debug: $(NAME)
20+
main.o: cutmp3.h
21+
main.o: CFLAGS+=-DVERSION=\"$(VERSION)\"
22+
*.o: Makefile mpglib.h
23+
24+
ifeq ($(LNOISE), yes)
25+
CFLAGS+=$(LNSFLAGS)
26+
OBJECTS+=linenoise/linenoise.o
27+
LDFLAGS:=$(filter-out -lreadline,$(LDFLAGS))
28+
*.o: linenoise/linenoise.h
29+
linenoise/linenoise.o: Makefile linenoise/linenoise.h
30+
endif
31+
32+
all: $(info )
33+
all: $(info *** You need readline-devel or similar to compile $(NAME). Alternatively call 'make LNOISE=yes' ***)
34+
all: $(info *** to build with linenoise, a self contained line editor. (see README for more information) ***)
35+
all: $(info )
36+
37+
$(NAME): $(OBJECTS)
38+
$(CC) -o $(NAME) $(OBJECTS) $(LDFLAGS)
2239

2340
clean:
24-
rm -f *.o
25-
rm -f ${NAME}
41+
@rm -vf *.o linenoise/*.o $(NAME)
2642

2743
install:
28-
install -d ${BINDIR}
29-
install ${NAME} ${BINDIR}
30-
strip ${BINDIR}/${NAME}
31-
if [ ! -z "${KDEDIR}" ]; then install -m 644 ${NAME}.desktop ${KDEDIR}/share/apps/konqueror/servicemenus; elif [ -d /usr/share/apps/konqueror/servicemenus ]; then install -m 644 ${NAME}.desktop /usr/share/apps/konqueror/servicemenus; elif [ -d /opt/kde/share/apps/konqueror/servicemenus ]; then install -m 644 ${NAME}.desktop /opt/kde/share/apps/konqueror/servicemenus; elif [ -d /opt/kde3/share/apps/konqueror/servicemenus ]; then install -m 644 ${NAME}.desktop /opt/kde3/share/apps/konqueror/servicemenus; fi
32-
install -d ${DOCDIR}/${NAME}
33-
install -m 644 README* USAGE ${DOCDIR}/${NAME}
34-
install -d ${MANDIR}
35-
gzip ${NAME}.1
36-
install -m 644 ${NAME}.1.gz ${MANDIR}
37-
gunzip ${NAME}.1.gz
44+
install -d $(BINDIR)
45+
install $(NAME) $(BINDIR)
46+
strip $(BINDIR)/$(NAME)
47+
if [ ! -z "$(KDEDIR)" ]; then install -m 644 $(NAME).desktop $(KDEDIR)/share/apps/konqueror/servicemenus; elif [ -d /usr/share/apps/konqueror/servicemenus ]; then install -m 644 $(NAME).desktop /usr/share/apps/konqueror/servicemenus; elif [ -d /opt/kde/share/apps/konqueror/servicemenus ]; then install -m 644 $(NAME).desktop /opt/kde/share/apps/konqueror/servicemenus; elif [ -d /opt/kde3/share/apps/konqueror/servicemenus ]; then install -m 644 $(NAME).desktop /opt/kde3/share/apps/konqueror/servicemenus; fi
48+
install -d $(DOCDIR)/$(NAME)
49+
install -m 644 README* USAGE $(DOCDIR)/$(NAME)
50+
install -d $(MANDIR)
51+
install -m 644 $(NAME).1 $(MANDIR)
52+
gzip $(MANDIR)/$(NAME).1
3853

3954
uninstall:
40-
rm -f ${BINDIR}/${NAME}
41-
rm -f ${KDEDIR}/share/apps/konqueror/servicemenus/${NAME}.desktop
42-
43-
debug:
44-
gcc ${CFLAGS} -DDEBUG -g mpglib.c main.c -o ${NAME} -lm -lreadline
55+
@rm -rvf $(BINDIR)/$(NAME) $(DOCDIR)/$(NAME) $(MANDIR)/$(NAME).1.gz $(KDEDIR)/share/apps/konqueror/servicemenus/$(NAME).desktop /usr/share/apps/konqueror/servicemenus/$(NAME).desktop /opt/kde3/share/apps/konqueror/servicemenus/$(NAME).desktop

‎TODO

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fading would be great
22

33
fix volume()
4-
Makefile
54
/dev/shm
5+
https://github.com/lieff/minimp3.git

‎cutmp3.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH CUTMP3 1 "Aug 31, 2022" "cutmp3 3.0.2" "Utility Commands"
1+
.TH CUTMP3 1 "5 Apr 2023" "cutmp3 4.0" "Utility Commands"
22
.SH NAME
33
cutmp3 \- a fast and leightweight mp3 editor
44
.SH SYNOPSIS

‎cutmp3.h

+8-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@
1010
#include <sys/time.h>
1111
#include <sys/types.h>
1212

13-
#include <readline/readline.h>
14-
#include <readline/history.h>
13+
#ifdef LINENOISE
14+
# include "linenoise/linenoise.h"
15+
# define readline linenoise
16+
#else
17+
# include <readline/readline.h>
18+
# include <readline/history.h>
19+
#endif
1520

1621
#include "mpglib.h"
1722

@@ -25,7 +30,7 @@ unsigned int layer(unsigned char secondbyte);
2530
unsigned int sampfreq(unsigned char secondbyte, unsigned char thirdbyte);
2631
unsigned int channelmode(unsigned char fourthbyte);
2732
unsigned int channels(unsigned char fourthbyte);
28-
unsigned int bitrate(unsigned char secondbyte,unsigned char thirdbyte);
33+
unsigned int bitrate(unsigned char secondbyte, unsigned char thirdbyte);
2934
unsigned int paddingbit(unsigned char thirdbyte);
3035
unsigned int framesize(unsigned char secondbyte,unsigned char thirdbyte,unsigned char fourthbyte);
3136
unsigned int is_header(int secondbyte, int thirdbyte, int fourthbyte);

‎linenoise

Submodule linenoise added at 93b2db9

‎main.c

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
#include "cutmp3.h"
1818

19-
#define VERSION "3.0.2"
20-
#define YEAR "2022"
21-
2219
/* general buffersize */
2320
#define BUFFER 32000
2421
#define FN_LEN 8191

0 commit comments

Comments
 (0)