Request 4065 (accepted)

butt.changes Changed

butt.spec Changed

butt-0.1.15.tar.gz/ChangeLog -> butt-0.1.16.tar.gz/ChangeLog Changed

butt-0.1.15.tar.gz/config.h -> butt-0.1.16.tar.gz/config.h Changed

butt-0.1.15.tar.gz/configure -> butt-0.1.16.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for butt 0.1.15.
+# Generated by GNU Autoconf 2.69 for butt 0.1.16.
 #
 # Report bugs to <BUG-REPORT-ADDRESS>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='butt'
 PACKAGE_TARNAME='butt'
-PACKAGE_VERSION='0.1.15'
-PACKAGE_STRING='butt 0.1.15'
+PACKAGE_VERSION='0.1.16'
+PACKAGE_STRING='butt 0.1.16'
 PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
 PACKAGE_URL=''
 
@@ -1281,7 +1281,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures butt 0.1.15 to adapt to many kinds of systems.
+\`configure' configures butt 0.1.16 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1351,7 +1351,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of butt 0.1.15:";;
+     short | recursive ) echo "Configuration of butt 0.1.16:";;
    esac
   cat <<\_ACEOF
 
@@ -1450,7 +1450,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-butt configure 0.1.15
+butt configure 0.1.16
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1911,7 +1911,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by butt $as_me 0.1.15, which was
+It was created by butt $as_me 0.1.16, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2774,7 +2774,7 @@
 
 # Define the identity of the package.
  PACKAGE='butt'
- VERSION='0.1.15'
+ VERSION='0.1.16'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6317,7 +6317,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by butt $as_me 0.1.15, which was
+This file was extended by butt $as_me 0.1.16, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6383,7 +6383,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-butt config.status 0.1.15
+butt config.status 0.1.16
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

butt-0.1.15.tar.gz/configure.ac -> butt-0.1.16.tar.gz/configure.ac Changed

butt-0.1.15.tar.gz/src/aac_encode.cpp -> butt-0.1.16.tar.gz/src/aac_encode.cpp Changed

butt-0.1.15.tar.gz/src/aac_encode.h -> butt-0.1.16.tar.gz/src/aac_encode.h Changed

butt-0.1.15.tar.gz/src/butt.cpp -> butt-0.1.16.tar.gz/src/butt.cpp Changed

butt-0.1.15.tar.gz/src/cfg.cpp -> butt-0.1.16.tar.gz/src/cfg.cpp Changed

@@ -114,16 +114,18 @@
             "bitrate = %d\n"
             "channel = %d\n"
             "codec = %s\n"
-            "resample_mode = %d\n"
+            "aac_overwrite_aot = %d\n"
             "aac_aot = %d\n"
+            "resample_mode = %d\n"
             "buffer_ms = %d\n\n",
             cfg.audio.dev_num,
             cfg.audio.samplerate,
             cfg.audio.bitrate,
             cfg.audio.channel,
             cfg.audio.codec,
-            cfg.audio.resample_mode,
+            cfg.audio.aac_overwrite_aot,
             cfg.audio.aac_aot,
+            cfg.audio.resample_mode,
             cfg.audio.buffer_ms
            );
 
@@ -259,6 +261,7 @@
     cfg.audio.codec      = cfg_get_str("audio", "codec");
     cfg.audio.buffer_ms  = cfg_get_int("audio", "buffer_ms");
     cfg.audio.aac_aot    = cfg_get_int("audio", "aac_aot");
+    cfg.audio.aac_overwrite_aot = cfg_get_int("audio", "aac_overwrite_aot");
     cfg.audio.pcm_list   = snd_get_devices(&cfg.audio.dev_count);
 
     cfg.audio.resample_mode  = cfg_get_int("audio", "resample_mode");
@@ -287,9 +290,14 @@
     if(cfg.audio.buffer_ms == -1)
         cfg.audio.buffer_ms = 50;
 
-    if(cfg.audio.aac_aot == -1)
-        cfg.audio.aac_aot = 5; // aac+ v1
+    if(cfg.audio.aac_overwrite_aot == -1)
+        cfg.audio.aac_overwrite_aot = 0;
+    
+    aac_stream.overwrite_aot = cfg.audio.aac_overwrite_aot;
+    aac_rec.overwrite_aot = cfg.audio.aac_overwrite_aot;
 
+    if(cfg.audio.aac_aot == -1)
+        cfg.audio.aac_aot = 5;
 
     if(cfg.audio.resample_mode == -1)
         cfg.audio.resample_mode = 0; //SRC_SINC_BEST_QUALITY
@@ -593,6 +601,7 @@
             "codec = mp3\n"
             "resample_mode = 0\n" //SRC_SINC_BEST_QUALITY
             "aac_aot = 5\n" // aac+ v1
+            "aac_overwrite_aot = 0\n"
             "buffer_ms = 50\n\n"
            );

butt-0.1.15.tar.gz/src/cfg.h -> butt-0.1.16.tar.gz/src/cfg.h Changed

butt-0.1.15.tar.gz/src/shoutcast.cpp -> butt-0.1.16.tar.gz/src/shoutcast.cpp Changed

@@ -99,10 +99,9 @@
     }
 
     error_printed = 0;
-
-    sock_send(&stream_socket, cfg.srv[cfg.selected_srv]->pwd,
-            strlen(cfg.srv[cfg.selected_srv]->pwd), SEND_TIMEOUT);
-    sock_send(&stream_socket, "\n", 1, SEND_TIMEOUT);
+    
+    snprintf(send_buf, sizeof(send_buf), "%s%s", cfg.srv[cfg.selected_srv]->pwd, "\r\n");
+    sock_send(&stream_socket, send_buf, strlen(send_buf), SEND_TIMEOUT);
     
     // Make butt compatible to proxies/load balancers. Thanks to boyska
     if(cfg.srv[cfg.selected_srv]->port == 80)
@@ -144,11 +143,10 @@
         strcpy(send_buf,  "audio/ogg");
 
     sock_send(&stream_socket, send_buf, strlen(send_buf), SEND_TIMEOUT);
+   
     
     sock_send(&stream_socket, "\r\n\r\n", 4, SEND_TIMEOUT);
 
-
-
     if((ret = sock_recv(&stream_socket, recv_buf, sizeof(recv_buf)-1, RECV_TIMEOUT)) == 0)
     {
         usleep(100*1000);
@@ -161,7 +159,7 @@
 
     if( (recv_buf[0] != 'O') || (recv_buf[1] != 'K') || (ret <= 2) )
     {
-        if(strstr(recv_buf, "invalid password") != NULL)
+        if(strstr(recv_buf, "invalid password") != NULL || (strstr(recv_buf, "Invalid Password") != NULL))
         {
             print_info("\nConnect: Invalid password!\n", 1);
             sc_disconnect();
@@ -172,8 +170,6 @@
 
 
 
- 
-
     connected = 1;
 
     timer_init(&stream_timer, 1);       //starts the "online" timer

butt-0.1.15.tar.gz/xcode/lib/libportaudio.a -> butt-0.1.16.tar.gz/xcode/lib/libportaudio.a Changed

Overview

Request 4065 (accepted)

Request History