Attachment #359862 for bug #479566

View | Details | Raw Unified | Return to bug 479566
Collapse All | Expand All





#: modules/gui/qt4/menus.cpp:482
msgid "Ctrl+L"
msgstr "Ctrl+L"

#: modules/gui/qt4/menus.cpp:485
msgid "Docked Playlist"


#: modules/gui/qt4/menus.cpp:497
msgid "Ctrl+H"
msgstr "Ctrl+H"

#: modules/gui/qt4/menus.cpp:506
msgid "&Fullscreen Interface"
- 
--
modules/mux/ogg.c |    1 +
1 file changed, 1 insertion(+)




    op.b_o_s    = 0;
    op.e_o_s    = 0;
    op.packetno = p_stream->i_packet_no++;
    op.granulepos = -1;

    if( p_stream->i_cat == AUDIO_ES )
    {
- 
--
modules/gui/qt4/components/preferences_widgets.cpp |   14 +++++++-------
modules/gui/qt4/util/customwidgets.cpp             |    4 ++--
modules/gui/qt4/util/customwidgets.hpp             |    2 +-
3 files changed, 10 insertions(+), 10 deletions(-)




            treeItem->setData( ACTION_COL, Qt::UserRole,
                               QVariant( qfu( p_config_item->psz_name ) ) );

            QString keys = qfu(p_config_item->value.psz ? _(p_config_item->value.psz) : "");
            treeItem->setText( HOTKEY_COL, keys );
            treeItem->setToolTip( HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );
            treeItem->setToolTip( GLOBAL_HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );
            treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( p_config_item->value.psz ) );
            table->addTopLevelItem( treeItem );
            continue;
        }


    if( d->result() == QDialog::Accepted )
    {
        QString newKey = VLCKeyToString( d->keyValue, false );

        /* In case of conflict, reset other keys*/
        if( d->conflicts )

            }
        }

        keyItem->setText( column, VLCKeyToString( d->keyValue, true ) );
        keyItem->setData( column, Qt::UserRole, newKey );
    }
    else if( d->result() == 2 )

void KeyInputDialog::checkForConflicts( int i_vlckey, const QString &sequence )
{
    QList<QTreeWidgetItem *> conflictList =
        table->findItems( VLCKeyToString( i_vlckey, true ), Qt::MatchExactly,
                          b_global ? 2 : 1 );

    if( conflictList.count() &&

    int i_vlck = qtEventToVLCKey( e );
    QKeySequence sequence( e->key() | e->modifiers() );
    selected->setText( qtr( "Key or combination: " )
                + QString("<b>%1</b>").arg( VLCKeyToString( i_vlck, true ) ) );
    checkForConflicts( i_vlck, sequence.toString() );
    keyValue = i_vlck;
}

void KeyInputDialog::wheelEvent( QWheelEvent *e )
{
    int i_vlck = qtWheelEventToVLCKey( e );
    selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck, true ) );
    checkForConflicts( i_vlck, QString() );
    keyValue = i_vlck;
}

Lines 287-295 int qtWheelEventToVLCKey( QWheelEvent *e ) Link Here

(-)a/modules/gui/qt4/util/customwidgets.cpp (-2 / +2 lines)
287	return i_vlck;	287	return i_vlck;
288	}	288	}
289		289
290	QString VLCKeyToString( unsigned val )	290	QString VLCKeyToString( unsigned val, bool locale )
291	{	291	{
292	char *base = vlc_keycode2str (val, true);	292	char *base = vlc_keycode2str (val, locale);
293	if (base == NULL)	293	if (base == NULL)
294	return qtr( "Unset" );	294	return qtr( "Unset" );
295		295

Lines 167-172 class QInputEvent; Link Here

(-)a/modules/gui/qt4/util/customwidgets.hpp (-3 / +1 lines)
167	int qtKeyModifiersToVLC( QInputEvent* e );	167	int qtKeyModifiersToVLC( QInputEvent* e );
168	int qtEventToVLCKey( QKeyEvent *e );	168	int qtEventToVLCKey( QKeyEvent *e );
169	int qtWheelEventToVLCKey( QWheelEvent *e );	169	int qtWheelEventToVLCKey( QWheelEvent *e );
170	QString VLCKeyToString( unsigned val );	170	QString VLCKeyToString( unsigned val, bool );
171		171
172	#endif	172	#endif
173	-
174	--
175	modules/gui/qt4/components/controller_widget.cpp \| 4 ++--	173	modules/gui/qt4/components/controller_widget.cpp \| 4 ++--
176	1 file changed, 2 insertions(+), 2 deletions(-)	174	1 file changed, 2 insertions(+), 2 deletions(-)




        volumeControlWidget = NULL;

        /* And add the label */
        layout->addWidget( volMuteLabel, 0, b_shiny? Qt::AlignBottom : Qt::AlignCenter );
    }
    else
    {

    if( b_special )
        subLayout->addWidget( volumeSlider );
    else
        layout->addWidget( volumeSlider, 0, b_shiny? Qt::AlignBottom : Qt::AlignCenter );

    /* Set the volume from the config */
    float volume = playlist_VolumeGet( THEPL );
- 
use 0 as time when encoding
--
modules/codec/avcodec/encoder.c |   14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)




        AVPacket packet = {0};
        avcodec_get_frame_defaults( p_sys->frame );
        p_sys->frame->format     = p_sys->p_context->sample_fmt;
        p_sys->frame->pts        = date_Get( &p_sys->buffer_date );
        p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
        date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );

        if( unlikely( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) &&
            (p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) ) )
            date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );

        p_sys->frame->pts        = date_Get( &p_sys->buffer_date );
        date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
        if( likely( p_aout_buf ) )
        {

            p_aout_buf->i_nb_samples -= leftover_samples;
            memcpy( p_sys->p_buffer+buffer_delay, p_aout_buf->p_buffer, leftover );


            p_aout_buf->i_buffer     -= leftover;
            p_aout_buf->i_pts         = date_Get( &p_sys->buffer_date );
        }

        if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
                     !(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME ))
          )

        const int align = 1;
#endif

        if( unlikely( p_aout_buf->i_pts > VLC_TS_INVALID &&
                      p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) )
            date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );

        avcodec_get_frame_defaults( p_sys->frame );
        if( p_sys->b_variable )
            p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
- 
(cherry picked from commit
af762f811d4ed34a883bc2003f4c70e18f66965e)
--
modules/stream_out/transcode/audio.c |   12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)




        if( p_sys->b_master_sync )
        {
            mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
            mtime_t i_drift = 0;

            if( likely( p_audio_buf->i_pts != VLC_TS_INVALID ) )
                i_drift = p_audio_buf->i_pts - i_pts;

            if ( unlikely(i_drift > MASTER_SYNC_MAX_DRIFT
                 || i_drift < -MASTER_SYNC_MAX_DRIFT) )
            {
                msg_Dbg( p_stream,
                    "drift is too high (%"PRId64"), resetting master sync",

                date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
                i_pts = p_audio_buf->i_pts + 1;
            }
            if( likely(p_audio_buf->i_pts != VLC_TS_INVALID ) )
                p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
            date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
            p_audio_buf->i_pts = i_pts;
        }
- 
--
share/lua/intf/modules/httprequests.lua |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)




    end
    local i=1
    while 1 do
        i=i+1
        local first, last = strfind(text, delimiter, pos)
        if first then -- found?
            tinsert(list,i, strsub(text, pos, first-1))

            tinsert(list,i, strsub(text, pos))
            break
        end
        i = i+1
    end
    return list
end
- 
(close #9139)
--
configure.ac |    5 -----
1 file changed, 5 deletions(-)




      [AS_HELP_STRING([--with-macosx-version-min=VERSION],
        [compile for Mac OS X VERSION and above])])
    if test "${with_macosx_version_min}" != "" ; then
        MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
        CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
        CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
        CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
        OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
        LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
        CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
        CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
        OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
        export MACOSX_DEPLOYMENT_TARGET
    fi
    ;;
  *mingw32* | *cygwin* | *wince* | *mingwce*)
- 
--
contrib/src/zvbi/rules.mak                    |    3 +++
contrib/src/zvbi/zvbi-fix-clang-support.patch |   30 +++++++++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 contrib/src/zvbi/zvbi-fix-clang-support.patch

Lines 20-25 zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi Link Here

(-)a/contrib/src/zvbi/rules.mak (+3 lines)
20	ifdef HAVE_WIN32	20	ifdef HAVE_WIN32
21	$(APPLY) $(SRC)/zvbi/zvbi-win32.patch	21	$(APPLY) $(SRC)/zvbi/zvbi-win32.patch
22	endif	22	endif
		23	ifdef HAVE_DARWIN_OS
		24	$(APPLY) $(SRC)/zvbi/zvbi-fix-clang-support.patch
		25	endif
23	$(MOVE)	26	$(MOVE)
24		27
25	DEPS_zvbi = pthreads iconv $(DEPS_iconv)	28	DEPS_zvbi = pthreads iconv $(DEPS_iconv)

Line 0 Link Here

(-)a/src/input/es_out.c (-3 / +4 lines)
		1	diff -ru zvbi/src/misc.h zvbi-fixed/src/misc.h
		2	--- zvbi/src/misc.h 2013-07-02 04:32:31.000000000 +0200
Lines 1772-1778 static void EsOutSelect( es_out_t out, es_out_id_t es, bool b_force ) Link Here
1772	LanguageArrayIndex( p_sys->ppsz_audio_language,	1772	LanguageArrayIndex( p_sys->ppsz_audio_language,
1773	p_sys->p_es_audio->psz_language_code );	1773	p_sys->p_es_audio->psz_language_code );
1774	if( es_idx >= 0 &&	1774	if( es_idx >= 0 &&
1775	( es_idx < selected_es_idx \|\|	1775	( selected_es_idx < 0 \|\| es_idx < selected_es_idx \|\|
1776	( es_idx == selected_es_idx &&	1776	( es_idx == selected_es_idx &&
1777	p_sys->p_es_audio->fmt.i_priority < es->fmt.i_priority ) ) )	1777	p_sys->p_es_audio->fmt.i_priority < es->fmt.i_priority ) ) )
1778	i_wanted = es->i_channel;	1778	i_wanted = es->i_channel;
Lines 1823-1829 static void EsOutSelect( es_out_t out, es_out_id_t es, bool b_force ) Link Here
1823	p_sys->p_es_sub->psz_language_code );	1823	p_sys->p_es_sub->psz_language_code );
1824		1824
1825	if( es_idx >= 0 &&	1825	if( es_idx >= 0 &&
1826	( es_idx < selected_es_idx \|\|	1826	( selected_es_idx < 0 \|\| es_idx < selected_es_idx \|\|
1827	( es_idx == selected_es_idx &&	1827	( es_idx == selected_es_idx &&
1828	p_sys->p_es_sub->fmt.i_priority < es->fmt.i_priority ) ) )	1828	p_sys->p_es_sub->fmt.i_priority < es->fmt.i_priority ) ) )
1829	i_wanted = es->i_channel;	1829	i_wanted = es->i_channel;
1830	-

Return to bug 479566

Lines 21728-21734 msgstr "Wiedergabeliste" Link Here

(-)a/po/de.po (-4 / +2 lines)
21728		21728
21729	#: modules/gui/qt4/menus.cpp:482	21729	#: modules/gui/qt4/menus.cpp:482
21730	msgid "Ctrl+L"	21730	msgid "Ctrl+L"
21731	msgstr "Strg+L"	21731	msgstr "Ctrl+L"
21732		21732
21733	#: modules/gui/qt4/menus.cpp:485	21733	#: modules/gui/qt4/menus.cpp:485
21734	msgid "Docked Playlist"	21734	msgid "Docked Playlist"
Lines 21740-21746 msgstr "Mi&nimale Ansicht" Link Here
21740		21740
21741	#: modules/gui/qt4/menus.cpp:497	21741	#: modules/gui/qt4/menus.cpp:497
21742	msgid "Ctrl+H"	21742	msgid "Ctrl+H"
21743	msgstr "Strg+H"	21743	msgstr "Ctrl+H"
21744		21744
21745	#: modules/gui/qt4/menus.cpp:506	21745	#: modules/gui/qt4/menus.cpp:506
21746	msgid "&Fullscreen Interface"	21746	msgid "&Fullscreen Interface"
21747	-
21748	--
21749	modules/mux/ogg.c \| 1 +	21747	modules/mux/ogg.c \| 1 +
21750	1 file changed, 1 insertion(+)	21748	1 file changed, 1 insertion(+)

Lines 989-994 static int MuxBlock( sout_mux_t p_mux, sout_input_t p_input ) Link Here

(-)a/modules/mux/ogg.c (-2 / +1 lines)
989	op.b_o_s = 0;	989	op.b_o_s = 0;
990	op.e_o_s = 0;	990	op.e_o_s = 0;
991	op.packetno = p_stream->i_packet_no++;	991	op.packetno = p_stream->i_packet_no++;
		992	op.granulepos = -1;
992		993
993	if( p_stream->i_cat == AUDIO_ES )	994	if( p_stream->i_cat == AUDIO_ES )
994	{	995	{
995	-
996	--
997	modules/gui/qt4/components/preferences_widgets.cpp \| 14 +++++++-------	996	modules/gui/qt4/components/preferences_widgets.cpp \| 14 +++++++-------
998	modules/gui/qt4/util/customwidgets.cpp \| 4 ++--	997	modules/gui/qt4/util/customwidgets.cpp \| 4 ++--
999	modules/gui/qt4/util/customwidgets.hpp \| 2 +-	998	modules/gui/qt4/util/customwidgets.hpp \| 2 +-
1000	3 files changed, 10 insertions(+), 10 deletions(-)	999	3 files changed, 10 insertions(+), 10 deletions(-)

Lines 1149-1160 static block_t EncodeAudio( encoder_t p_enc, block_t *p_aout_buf ) Link Here

(-)a/modules/codec/avcodec/encoder.c (-8 / +8 lines)
1149	AVPacket packet = {0};	1149	AVPacket packet = {0};
1150	avcodec_get_frame_defaults( p_sys->frame );	1150	avcodec_get_frame_defaults( p_sys->frame );
1151	p_sys->frame->format = p_sys->p_context->sample_fmt;	1151	p_sys->frame->format = p_sys->p_context->sample_fmt;
1152	p_sys->frame->pts = date_Get( &p_sys->buffer_date );
1153	p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;	1152	p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
1154	date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
1155		1153
		1154	if( unlikely( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) &&
		1155	(p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) ) )
		1156	date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
		1157
		1158	p_sys->frame->pts = date_Get( &p_sys->buffer_date );
		1159	date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
1156	if( likely( p_aout_buf ) )	1160	if( likely( p_aout_buf ) )
1157	{	1161	{
		1162
1158	p_aout_buf->i_nb_samples -= leftover_samples;	1163	p_aout_buf->i_nb_samples -= leftover_samples;
1159	memcpy( p_sys->p_buffer+buffer_delay, p_aout_buf->p_buffer, leftover );	1164	memcpy( p_sys->p_buffer+buffer_delay, p_aout_buf->p_buffer, leftover );
1160		1165
Lines 1169-1174 static block_t EncodeAudio( encoder_t p_enc, block_t *p_aout_buf ) Link Here
1169	p_aout_buf->i_buffer -= leftover;	1174	p_aout_buf->i_buffer -= leftover;
1170	p_aout_buf->i_pts = date_Get( &p_sys->buffer_date );	1175	p_aout_buf->i_pts = date_Get( &p_sys->buffer_date );
1171	}	1176	}
		1177
1172	if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&	1178	if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
1173	!(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME ))	1179	!(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME ))
1174	)	1180	)
Lines 1254-1263 static block_t EncodeAudio( encoder_t p_enc, block_t *p_aout_buf ) Link Here
1254	const int align = 1;	1260	const int align = 1;
1255	#endif	1261	#endif
1256		1262
1257	if( unlikely( p_aout_buf->i_pts > VLC_TS_INVALID &&
1258	p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) )
1259	date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
1260
1261	avcodec_get_frame_defaults( p_sys->frame );	1263	avcodec_get_frame_defaults( p_sys->frame );
1262	if( p_sys->b_variable )	1264	if( p_sys->b_variable )
1263	p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;	1265	p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
1264	-
1265	(cherry picked from commit	1266	(cherry picked from commit
1266	af762f811d4ed34a883bc2003f4c70e18f66965e)	1267	af762f811d4ed34a883bc2003f4c70e18f66965e)
1267	--
1268	modules/stream_out/transcode/audio.c \| 12 +++++++++---	1268	modules/stream_out/transcode/audio.c \| 12 +++++++++---
1269	1 file changed, 9 insertions(+), 3 deletions(-)	1269	1 file changed, 9 insertions(+), 3 deletions(-)

Lines 216-223 int transcode_audio_process( sout_stream_t *p_stream, Link Here

(-)a/modules/stream_out/transcode/audio.c (-5 / +9 lines)
216	if( p_sys->b_master_sync )	216	if( p_sys->b_master_sync )
217	{	217	{
218	mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;	218	mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1;
219	mtime_t i_drift = p_audio_buf->i_pts - i_pts;	219	mtime_t i_drift = 0;
220	if (i_drift > MASTER_SYNC_MAX_DRIFT \|\| i_drift < -MASTER_SYNC_MAX_DRIFT)	220
		221	if( likely( p_audio_buf->i_pts != VLC_TS_INVALID ) )
		222	i_drift = p_audio_buf->i_pts - i_pts;
		223
		224	if ( unlikely(i_drift > MASTER_SYNC_MAX_DRIFT
		225	\|\| i_drift < -MASTER_SYNC_MAX_DRIFT) )
221	{	226	{
222	msg_Dbg( p_stream,	227	msg_Dbg( p_stream,
223	"drift is too high (%"PRId64"), resetting master sync",	228	"drift is too high (%"PRId64"), resetting master sync",
Lines 225-231 int transcode_audio_process( sout_stream_t *p_stream, Link Here
225	date_Set( &id->interpolated_pts, p_audio_buf->i_pts );	230	date_Set( &id->interpolated_pts, p_audio_buf->i_pts );
226	i_pts = p_audio_buf->i_pts + 1;	231	i_pts = p_audio_buf->i_pts + 1;
227	}	232	}
228	p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;	233	if( likely(p_audio_buf->i_pts != VLC_TS_INVALID ) )
		234	p_sys->i_master_drift = p_audio_buf->i_pts - i_pts;
229	date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );	235	date_Increment( &id->interpolated_pts, p_audio_buf->i_nb_samples );
230	p_audio_buf->i_pts = i_pts;	236	p_audio_buf->i_pts = i_pts;
231	}	237	}
232	-
233	--
234	share/lua/intf/modules/httprequests.lua \| 2 +-	238	share/lua/intf/modules/httprequests.lua \| 2 +-
235	1 file changed, 1 insertion(+), 1 deletion(-)	239	1 file changed, 1 insertion(+), 1 deletion(-)

Lines 1228-1238 void KeySelectorControl::finish() Link Here

(-)a/modules/gui/qt4/components/preferences_widgets.cpp (-7 / +7 lines)
1228	treeItem->setData( ACTION_COL, Qt::UserRole,	1228	treeItem->setData( ACTION_COL, Qt::UserRole,
1229	QVariant( qfu( p_config_item->psz_name ) ) );	1229	QVariant( qfu( p_config_item->psz_name ) ) );
1230		1230
1231	QString keys = qfu( p_config_item->value.psz );	1231	QString keys = qfu(p_config_item->value.psz ? _(p_config_item->value.psz) : "");
1232	treeItem->setText( HOTKEY_COL, keys );	1232	treeItem->setText( HOTKEY_COL, keys );
1233	treeItem->setToolTip( HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );	1233	treeItem->setToolTip( HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );
1234	treeItem->setToolTip( GLOBAL_HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );	1234	treeItem->setToolTip( GLOBAL_HOTKEY_COL, qtr("Double click to change.\nDelete key to remove.") );
1235	treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( keys ) );	1235	treeItem->setData( HOTKEY_COL, Qt::UserRole, QVariant( p_config_item->value.psz ) );
1236	table->addTopLevelItem( treeItem );	1236	table->addTopLevelItem( treeItem );
1237	continue;	1237	continue;
1238	}	1238	}
Lines 1313-1319 void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem, int column ) Link Here
1313		1313
1314	if( d->result() == QDialog::Accepted )	1314	if( d->result() == QDialog::Accepted )
1315	{	1315	{
1316	QString newKey = VLCKeyToString( d->keyValue );	1316	QString newKey = VLCKeyToString( d->keyValue, false );
1317		1317
1318	/* In case of conflict, reset other keys*/	1318	/* In case of conflict, reset other keys*/
1319	if( d->conflicts )	1319	if( d->conflicts )
Lines 1331-1337 void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem, int column ) Link Here
1331	}	1331	}
1332	}	1332	}
1333		1333
1334	keyItem->setText( column, newKey );	1334	keyItem->setText( column, VLCKeyToString( d->keyValue, true ) );
1335	keyItem->setData( column, Qt::UserRole, newKey );	1335	keyItem->setData( column, Qt::UserRole, newKey );
1336	}	1336	}
1337	else if( d->result() == 2 )	1337	else if( d->result() == 2 )
Lines 1448-1454 void KeyInputDialog::setExistingkeysSet( const QSet<QString> *keyset ) Link Here
1448	void KeyInputDialog::checkForConflicts( int i_vlckey, const QString &sequence )	1448	void KeyInputDialog::checkForConflicts( int i_vlckey, const QString &sequence )
1449	{	1449	{
1450	QList<QTreeWidgetItem *> conflictList =	1450	QList<QTreeWidgetItem *> conflictList =
1451	table->findItems( VLCKeyToString( i_vlckey ), Qt::MatchExactly,	1451	table->findItems( VLCKeyToString( i_vlckey, true ), Qt::MatchExactly,
1452	b_global ? 2 : 1 );	1452	b_global ? 2 : 1 );
1453		1453
1454	if( conflictList.count() &&	1454	if( conflictList.count() &&
Lines 1491-1497 void KeyInputDialog::keyPressEvent( QKeyEvent *e ) Link Here
1491	int i_vlck = qtEventToVLCKey( e );	1491	int i_vlck = qtEventToVLCKey( e );
1492	QKeySequence sequence( e->key() \| e->modifiers() );	1492	QKeySequence sequence( e->key() \| e->modifiers() );
1493	selected->setText( qtr( "Key or combination: " )	1493	selected->setText( qtr( "Key or combination: " )
1494	+ QString("<b>%1</b>").arg( VLCKeyToString( i_vlck ) ) );	1494	+ QString("<b>%1</b>").arg( VLCKeyToString( i_vlck, true ) ) );
1495	checkForConflicts( i_vlck, sequence.toString() );	1495	checkForConflicts( i_vlck, sequence.toString() );
1496	keyValue = i_vlck;	1496	keyValue = i_vlck;
1497	}	1497	}
Lines 1499-1505 void KeyInputDialog::keyPressEvent( QKeyEvent *e ) Link Here
1499	void KeyInputDialog::wheelEvent( QWheelEvent *e )	1499	void KeyInputDialog::wheelEvent( QWheelEvent *e )
1500	{	1500	{
1501	int i_vlck = qtWheelEventToVLCKey( e );	1501	int i_vlck = qtWheelEventToVLCKey( e );
1502	selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );	1502	selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck, true ) );
1503	checkForConflicts( i_vlck, QString() );	1503	checkForConflicts( i_vlck, QString() );
1504	keyValue = i_vlck;	1504	keyValue = i_vlck;
1505	}	1505	}

Lines 64-70 SoundWidget::SoundWidget( QWidget _parent, intf_thread_t _p_intf, Link Here

(-)a/modules/gui/qt4/components/controller_widget.cpp (-4 / +2 lines)
64	volumeControlWidget = NULL;	64	volumeControlWidget = NULL;
65		65
66	/* And add the label */	66	/* And add the label */
67	layout->addWidget( volMuteLabel, 0, Qt::AlignBottom );	67	layout->addWidget( volMuteLabel, 0, b_shiny? Qt::AlignBottom : Qt::AlignCenter );
68	}	68	}
69	else	69	else
70	{	70	{
Lines 105-111 SoundWidget::SoundWidget( QWidget _parent, intf_thread_t _p_intf, Link Here
105	if( b_special )	105	if( b_special )
106	subLayout->addWidget( volumeSlider );	106	subLayout->addWidget( volumeSlider );
107	else	107	else
108	layout->addWidget( volumeSlider, 0, Qt::AlignBottom );	108	layout->addWidget( volumeSlider, 0, b_shiny? Qt::AlignBottom : Qt::AlignCenter );
109		109
110	/* Set the volume from the config */	110	/* Set the volume from the config */
111	float volume = playlist_VolumeGet( THEPL );	111	float volume = playlist_VolumeGet( THEPL );
112	-
113	use 0 as time when encoding	112	use 0 as time when encoding
114	--
115	modules/codec/avcodec/encoder.c \| 14 ++++++++------	113	modules/codec/avcodec/encoder.c \| 14 ++++++++------
116	1 file changed, 8 insertions(+), 6 deletions(-)	114	1 file changed, 8 insertions(+), 6 deletions(-)

Lines 52-58 function strsplit(text, delimiter) Link Here

(-)a/share/lua/intf/modules/httprequests.lua (-3 / +1 lines)
52	end	52	end
53	local i=1	53	local i=1
54	while 1 do	54	while 1 do
55	i=i+1
56	local first, last = strfind(text, delimiter, pos)	55	local first, last = strfind(text, delimiter, pos)
57	if first then -- found?	56	if first then -- found?
58	tinsert(list,i, strsub(text, pos, first-1))	57	tinsert(list,i, strsub(text, pos, first-1))
Lines 61-66 function strsplit(text, delimiter) Link Here
61	tinsert(list,i, strsub(text, pos))	60	tinsert(list,i, strsub(text, pos))
62	break	61	break
63	end	62	end
		63	i = i+1
64	end	64	end
65	return list	65	return list
66	end	66	end
67	-
68	(close #9139)	67	(close #9139)
69	--
70	configure.ac \| 5 -----	68	configure.ac \| 5 -----
71	1 file changed, 5 deletions(-)	69	1 file changed, 5 deletions(-)

Lines 189-204 case "${host_os}" in Link Here

(-)a/configure.ac (-7 lines)
189	[AS_HELP_STRING([--with-macosx-version-min=VERSION],	189	[AS_HELP_STRING([--with-macosx-version-min=VERSION],
190	[compile for Mac OS X VERSION and above])])	190	[compile for Mac OS X VERSION and above])])
191	if test "${with_macosx_version_min}" != "" ; then	191	if test "${with_macosx_version_min}" != "" ; then
192	MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
193	CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"	192	CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
194	CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"	193	CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
195	CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"	194	CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
196	OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"	195	OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
197	LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"	196	LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
198	CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
199	CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
200	OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
201	export MACOSX_DEPLOYMENT_TARGET
202	fi	197	fi
203	;;	198	;;
204	mingw32 \| cygwin \| wince \| mingwce)	199	mingw32 \| cygwin \| wince \| mingwce)
205	-
206	--
207	contrib/src/zvbi/rules.mak \| 3 +++	200	contrib/src/zvbi/rules.mak \| 3 +++
208	contrib/src/zvbi/zvbi-fix-clang-support.patch \| 30 +++++++++++++++++++++++++	201	contrib/src/zvbi/zvbi-fix-clang-support.patch \| 30 +++++++++++++++++++++++++
209	2 files changed, 33 insertions(+)	202	2 files changed, 33 insertions(+)
210	create mode 100644 contrib/src/zvbi/zvbi-fix-clang-support.patch	203	create mode 100644 contrib/src/zvbi/zvbi-fix-clang-support.patch