Imported Upstream version 3.4.3

parent ccea198c
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for audacious-plugins 3.4.2.
# Generated by GNU Autoconf 2.69 for audacious-plugins 3.4.3.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
......@@ -9,7 +9,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
# (C) 2005-2013 Audacious Team
# (C) 2005-2014 Audacious Team
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
......@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='audacious-plugins'
PACKAGE_TARNAME='audacious-plugins'
PACKAGE_VERSION='3.4.2'
PACKAGE_STRING='audacious-plugins 3.4.2'
PACKAGE_VERSION='3.4.3'
PACKAGE_STRING='audacious-plugins 3.4.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
......@@ -1561,7 +1561,7 @@ if test "$ac_init_help" = "long"; then
# 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 audacious-plugins 3.4.2 to adapt to many kinds of systems.
\`configure' configures audacious-plugins 3.4.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1628,7 +1628,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of audacious-plugins 3.4.2:";;
short | recursive ) echo "Configuration of audacious-plugins 3.4.3:";;
esac
cat <<\_ACEOF
......@@ -1916,14 +1916,14 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
audacious-plugins configure 3.4.2
audacious-plugins configure 3.4.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
(C) 2005-2013 Audacious Team
(C) 2005-2014 Audacious Team
_ACEOF
exit
fi
......@@ -2367,7 +2367,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by audacious-plugins $as_me 3.4.2, which was
It was created by audacious-plugins $as_me 3.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2720,7 +2720,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
PACKAGE=audacious-plugins
VERSION=3.4.2
VERSION=3.4.3
cat >>confdefs.h <<_ACEOF
......@@ -13892,7 +13892,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by audacious-plugins $as_me 3.4.2, which was
This file was extended by audacious-plugins $as_me 3.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -13958,7 +13958,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
audacious-plugins config.status 3.4.2
audacious-plugins config.status 3.4.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -5,8 +5,8 @@ dnl ***
dnl Initialize
dnl ==========
AC_PREREQ([2.59])
AC_INIT([audacious-plugins], [3.4.2])
AC_COPYRIGHT([(C) 2005-2013 Audacious Team])
AC_INIT([audacious-plugins], [3.4.3])
AC_COPYRIGHT([(C) 2005-2014 Audacious Team])
AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
AC_SUBST([VERSION], [AC_PACKAGE_VERSION])
......
......@@ -10,6 +10,7 @@
LOCALES = be.po \
bg.po \
ca.po \
cmn.po \
cs.po \
da.po \
de.po \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -13,6 +13,9 @@ bg.po)
ca.po)
LANGUAGE="Catalan"
;;
cmn.po)
LANGUAGE="Mandarin"
;;
cs.po)
LANGUAGE="Czech"
;;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -407,8 +407,9 @@ extern "C" bool_t adplug_init (void)
if (homedir)
{
std::string userdb;
userdb = std::string ("file://") + homedir + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
char * homeuri = filename_to_uri (homedir);
std::string userdb = std::string (homeuri) + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
free (homeuri);
if (vfs_file_test (userdb.c_str (), VFS_EXISTS))
{
......
......@@ -49,6 +49,7 @@
#include <audacious/playlist.h>
#include <audacious/plugin.h>
#include <audacious/preferences.h>
#include <libaudcore/audstrings.h>
#include <libaudcore/hook.h>
#include <libaudgui/libaudgui.h>
#include <libaudgui/libaudgui-gtk.h>
......@@ -507,12 +508,18 @@ static Tuple * make_tuple (const char * filename, VFSFile * file)
tuple_set_int (tuple, FIELD_LENGTH, NULL, calculate_track_length
(trackinfo[trackno].startlsn, trackinfo[trackno].endlsn));
if (trackinfo[trackno].name[0])
tuple_set_str (tuple, FIELD_TITLE, NULL, trackinfo[trackno].name);
else
{
SPRINTF (title, _("Track %d"), trackno);
tuple_set_str (tuple, FIELD_TITLE, NULL, title);
}
if (trackinfo[trackno].performer[0])
tuple_set_str (tuple, FIELD_ARTIST, NULL, trackinfo[trackno].performer);
if (trackinfo[0].name[0])
tuple_set_str (tuple, FIELD_ALBUM, NULL, trackinfo[0].name);
if (trackinfo[trackno].name[0])
tuple_set_str (tuple, FIELD_TITLE, NULL, trackinfo[trackno].name);
if (trackinfo[trackno].genre[0])
tuple_set_str (tuple, FIELD_GENRE, NULL, trackinfo[trackno].genre);
......@@ -679,12 +686,6 @@ static void scan_cd (void)
#endif
cdtext_was_available = TRUE;
}
else
{
cdaudio_set_strinfo (&trackinfo[trackno], "", "", "");
snprintf (trackinfo[trackno].name, DEF_STRING_LEN,
"Track %d", trackno);
}
}
if (!cdtext_was_available)
......
......@@ -52,12 +52,6 @@ typedef struct
}
CodecInfo;
/* str_unref() may be a macro */
static void str_unref_cb (void * str)
{
str_unref (str);
}
static gint lockmgr (void * * mutexp, enum AVLockOp op)
{
switch (op)
......@@ -107,7 +101,7 @@ static const gchar * ffaudio_strerror (gint error)
static GHashTable * create_extension_dict (void)
{
GHashTable * dict = g_hash_table_new_full (g_str_hash, g_str_equal,
str_unref_cb, NULL);
(GDestroyNotify) str_unref, NULL);
AVInputFormat * f;
for (f = av_iformat_next (NULL); f; f = av_iformat_next (f))
......@@ -180,18 +174,16 @@ static AVInputFormat * get_format_by_content (const gchar * name, VFSFile * file
{
if (filled < size)
filled += vfs_fread (buf + filled, 1, size - filled, file);
if (filled < size)
break;
memset (buf + size, 0, AVPROBE_PADDING_SIZE);
AVProbeData d = {name, buf, size};
memset (buf + filled, 0, AVPROBE_PADDING_SIZE);
AVProbeData d = {name, buf, filled};
score = target;
f = av_probe_input_format2 (& d, TRUE, & score);
if (f)
break;
if (size < 16384)
if (size < 16384 && filled == size)
size *= 4;
else if (target > 10)
target = 10;
......@@ -200,7 +192,7 @@ static AVInputFormat * get_format_by_content (const gchar * name, VFSFile * file
}
if (f)
AUDDBG ("Format %s, buffer size %d, score %d.\n", f->name, size, score);
AUDDBG ("Format %s, buffer size %d, score %d.\n", f->name, filled, score);
else
AUDDBG ("Format unknown.\n");
......@@ -683,6 +675,9 @@ static const gchar *ffaudio_fmts[] = {
/* Handle OGG streams (FLAC/Vorbis etc.) */
"ogg", "oga",
/* Opus */
"opus",
/* Speex */
"spx",
......
This diff is collapsed.
......@@ -63,12 +63,6 @@ static GtkWidget * entry, * help_label, * wait_label, * scrolled, * results_list
static void item_free (Item * item);
/* str_unref() may be a macro */
static void str_unref_cb (void * str)
{
str_unref (str);
}
static Item * item_new (int field, char * name, Item * parent)
{
Item * item = g_slice_new (Item);
......@@ -362,7 +356,8 @@ static void begin_add (const char * path)
/* speed things up by using g_direct_equal() instead of g_str_equal()
because identical pooled strings have the same pointer */
added_table = g_hash_table_new_full (g_str_hash, g_direct_equal, str_unref_cb, NULL);
added_table = g_hash_table_new_full (g_str_hash, g_direct_equal,
(GDestroyNotify) str_unref, NULL);
int entries = aud_playlist_entry_count (list);
......
......@@ -320,9 +320,7 @@ void skins_configure (void)
NULL);
drag_dest_set(skin_view);
g_signal_connect(mainwin, "drag-data-received",
G_CALLBACK(mainwin_drag_data_received),
skin_view);
g_signal_connect (skin_view, "destroy", (GCallback) gtk_widget_destroyed, & skin_view);
GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start ((GtkBox *) appearance_page_vbox, hbox, FALSE, FALSE, 0);
......
......@@ -53,8 +53,9 @@ cairo_surface_t * surface_new_from_file (const gchar * name)
guint32 surface_get_pixel (cairo_surface_t * s, gint x, gint y)
{
g_return_val_if_fail (x >= 0 && x < cairo_image_surface_get_width (s), 0);
g_return_val_if_fail (y >= 0 && y < cairo_image_surface_get_height (s), 0);
if (x < 0 || x >= cairo_image_surface_get_width (s) ||
y < 0 || y >= cairo_image_surface_get_height (s))
return 0;
return * ((guint32 *) (cairo_image_surface_get_data (s) +
cairo_image_surface_get_stride (s) * y) + x) & 0xffffff;
......
This diff is collapsed.
......@@ -28,6 +28,9 @@
#include <gtk/gtk.h>
#define EQUALIZER_DEFAULT_DIR_PRESET "dir_default.preset"
#define EQUALIZER_DEFAULT_PRESET_EXT "preset"
void equalizerwin_set_shape (void);
void equalizerwin_create(void);
void equalizerwin_show(gboolean show);
......
......@@ -35,7 +35,6 @@
#include <audacious/i18n.h>
#include <audacious/misc.h>
#include <libaudcore/audstrings.h>
#include <libaudcore/hook.h>
#include <libaudgui/libaudgui.h>
#include "actions-mainwin.h"
......@@ -218,17 +217,6 @@ static gboolean mainwin_vis_cb (GtkWidget * widget, GdkEventButton * event)
return TRUE;
}
static void show_main_menu (GdkEventButton * event, void * unused)
{
GdkScreen * screen = gdk_event_get_screen ((GdkEvent *) event);
gint width = gdk_screen_get_width (screen);
gint height = gdk_screen_get_height (screen);
ui_popup_menu_show (UI_MENU_MAIN, event->x_root, event->y_root,
event->x_root > width / 2, event->y_root > height / 2, event->button,
event->time);
}
static gchar *mainwin_tb_old_text = NULL;
static void mainwin_lock_info_text (const gchar * text)
......@@ -1476,7 +1464,6 @@ void mainwin_unhook (void)
seek_source = 0;
}
hook_dissociate ("show main menu", (HookFunction) show_main_menu);
ui_main_evlistener_dissociate ();
start_stop_visual (TRUE);
}
......@@ -1491,7 +1478,6 @@ mainwin_create(void)
mainwin_create_widgets();
show_widgets ();
hook_associate ("show main menu", (HookFunction) show_main_menu, 0);
status_message_enabled = TRUE;
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment